diff --git a/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/utils/BaseNotificationBuilder.java b/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/utils/BaseNotificationBuilder.java
index 0920d2760..bf605caf2 100644
--- a/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/utils/BaseNotificationBuilder.java
+++ b/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/utils/BaseNotificationBuilder.java
@@ -15,7 +15,6 @@
 import org.openapi.quarkus.party_registry_proxy_json.model.GeographicTaxonomyResource;
 import org.openapi.quarkus.party_registry_proxy_json.model.InstitutionResource;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 import java.time.OffsetDateTime;
@@ -55,9 +54,6 @@ public NotificationToSend buildNotificationToSend(Onboarding onboarding, Token t
         } else {
             notificationToSend.setId(UUID.randomUUID().toString());
         }
-        if (Objects.nonNull(token)) {
-            setTokenData(notificationToSend, token);
-        }
         notificationToSend.setState(convertOnboardingStatusToNotificationStatus(onboarding.getStatus()));
         mapDataFromOnboarding(onboarding, notificationToSend, queueEvent);
         notificationToSend.setInstitution(retrieveInstitution(institution));
@@ -181,11 +177,7 @@ private BillingToSend convertBilling(Billing billing) {
     @Override
     public void setTokenData(NotificationToSend notificationToSend, Token token) {
         if (Objects.nonNull(token) && Objects.nonNull(token.getContractSigned())) {
-            try {
-                notificationToSend.setFileName(Paths.get(new String(token.getContractSigned().getBytes("UTF-8"), "ISO-8859-1")).getFileName().toString());
-            } catch (UnsupportedEncodingException e) {
-                throw new RuntimeException(e);
-            }
+            notificationToSend.setFileName(Paths.get(new String(token.getContractSigned().getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8)).getFileName().toString());
             notificationToSend.setContentType(token.getContractSigned());
         }
     }