diff --git a/src/main/java/it/gov/pagopa/spontaneouspayment/service/PaymentsService.java b/src/main/java/it/gov/pagopa/spontaneouspayment/service/PaymentsService.java
index fe2637d..3d250c2 100644
--- a/src/main/java/it/gov/pagopa/spontaneouspayment/service/PaymentsService.java
+++ b/src/main/java/it/gov/pagopa/spontaneouspayment/service/PaymentsService.java
@@ -172,7 +172,11 @@ private PaymentPositionModel createDebtPosition(String organizationFiscalCode,
         pp.setSwitchToExpired(enrollment.isSwitchToExpired());
         pp.addPaymentOptions(po);
 
-        return gpdClient.createDebtPosition(organizationFiscalCode, pp);
+        PaymentPositionModel gpdResponse = gpdClient.createDebtPosition(organizationFiscalCode, pp);
+        // Forced set fiscal code -> https://editor.swagger.io/?url=https://raw.githubusercontent.com/pagopa/pagopa-debt-position/main/openapi/openapi_internal.json
+        gpdResponse.getPaymentOption().get(0).setOrganizationFiscalCode(organizationFiscalCode);
+
+        return gpdResponse;
     }