diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index 58977581..009c0fca 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopa-gpd-payments
 description: Microservice that exposes API for payment receipts retrieving and other operations
 type: application
-version: 0.48.0
-appVersion: 0.12.0
+version: 0.49.0
+appVersion: 0.12.0-1-fix
 dependencies:
   - name: microservice-chart
     version: 2.4.0
diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
index 7590f66a..6ff1b10f 100644
--- a/helm/values-dev.yaml
+++ b/helm/values-dev.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-gpd-payments
-    tag: "0.12.0"
+    tag: "0.12.0-1-fix"
     pullPolicy: Always
   livenessProbe:
     httpGet:
diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
index 4f9ae82f..b48cdc6b 100644
--- a/helm/values-prod.yaml
+++ b/helm/values-prod.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-gpd-payments
-    tag: "0.12.0"
+    tag: "0.12.0-1-fix"
     pullPolicy: Always
   livenessProbe:
     httpGet:
diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
index 19b1ffac..01ad3d89 100644
--- a/helm/values-uat.yaml
+++ b/helm/values-uat.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-gpd-payments
-    tag: "0.12.0"
+    tag: "0.12.0-1-fix"
     pullPolicy: Always
   livenessProbe:
     httpGet:
diff --git a/openapi/openapi.json b/openapi/openapi.json
index bc135910..4ab8f244 100644
--- a/openapi/openapi.json
+++ b/openapi/openapi.json
@@ -4,7 +4,7 @@
     "title": "PagoPA API Payments",
     "description": "Payments",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "0.12.0"
+    "version": "0.12.0-1-fix"
   },
   "servers": [
     {
diff --git a/pom.xml b/pom.xml
index 93078b8b..04e7f7a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>it.gov.pagopa</groupId>
     <artifactId>payments</artifactId>
-    <version>0.12.0</version>
+    <version>0.12.0-1-fix</version>
     <name>Payments</name>
     <description>Payments</description>
 
diff --git a/src/main/java/it/gov/pagopa/payments/service/PartnerService.java b/src/main/java/it/gov/pagopa/payments/service/PartnerService.java
index e5d44b35..acf3650a 100644
--- a/src/main/java/it/gov/pagopa/payments/service/PartnerService.java
+++ b/src/main/java/it/gov/pagopa/payments/service/PartnerService.java
@@ -362,7 +362,6 @@ private PaGetPaymentRes generatePaGetPaymentResponse(
     PaGetPaymentRes response = factory.createPaGetPaymentRes();
     CtPaymentPA responseData = factory.createCtPaymentPA();
     CtTransferListPA transferList = factory.createCtTransferListPA();
-    CtMetadata paymentOptionMetadata = factory.createCtMetadata();
 
     response.setOutcome(StOutcome.OK);
 
@@ -384,11 +383,15 @@ private PaGetPaymentRes generatePaGetPaymentResponse(
     CtSubject debtor = this.getDebtor(source);
     responseData.setDebtor(debtor);
 
-    List<CtMapEntry> poMapEntry = paymentOptionMetadata.getMapEntry();
-    for (PaymentOptionMetadataModel po : source.getPaymentOptionMetadata()) {
-      poMapEntry.add(getPaymentOptionMetadata(po));
+    List<PaymentOptionMetadataModel> paymentOptionMetadataModels = source.getPaymentOptionMetadata();
+    if (paymentOptionMetadataModels != null && !paymentOptionMetadataModels.isEmpty()) {
+      CtMetadata paymentOptionMetadata = factory.createCtMetadata();
+      List<CtMapEntry> poMapEntry = paymentOptionMetadata.getMapEntry();
+      for (PaymentOptionMetadataModel po : paymentOptionMetadataModels) {
+        poMapEntry.add(getPaymentOptionMetadata(po));
+      }
+      responseData.setMetadata(paymentOptionMetadata);
     }
-    responseData.setMetadata(paymentOptionMetadata);
 
     // Transfer list
     transferList
@@ -425,7 +428,6 @@ private PaGetPaymentV2Response generatePaGetPaymentResponse(
     PaGetPaymentV2Response response = factory.createPaGetPaymentV2Response();
     CtPaymentPAV2 responseData = factory.createCtPaymentPAV2();
     CtTransferListPAV2 transferList = factory.createCtTransferListPAV2();
-    CtMetadata paymentOptionMetadata = factory.createCtMetadata();
 
     response.setOutcome(StOutcome.OK);
 
@@ -445,11 +447,15 @@ private PaGetPaymentV2Response generatePaGetPaymentResponse(
     responseData.setCompanyName(Optional.ofNullable(source.getCompanyName()).orElse("NA"));
     responseData.setOfficeName(Optional.ofNullable(source.getOfficeName()).orElse(("NA")));
 
-    List<CtMapEntry> poMapEntry = paymentOptionMetadata.getMapEntry();
-    for (PaymentOptionMetadataModel po : source.getPaymentOptionMetadata()) {
-      poMapEntry.add(getPaymentOptionMetadata(po));
+    List<PaymentOptionMetadataModel> paymentOptionMetadataModels = source.getPaymentOptionMetadata();
+    if(paymentOptionMetadataModels != null && !paymentOptionMetadataModels.isEmpty()) {
+      CtMetadata paymentOptionMetadata = factory.createCtMetadata();
+      List<CtMapEntry> poMapEntry = paymentOptionMetadata.getMapEntry();
+      for (PaymentOptionMetadataModel po : paymentOptionMetadataModels) {
+        poMapEntry.add(getPaymentOptionMetadata(po));
+      }
+      responseData.setMetadata(paymentOptionMetadata);
     }
-    responseData.setMetadata(paymentOptionMetadata);
 
     // debtor data
     CtSubject debtor = this.getDebtor(source);
@@ -530,12 +536,15 @@ private CtTransferPA getTransferResponse(
     transferPA.setTransferAmount(BigDecimal.valueOf(transfer.getAmount()));
     transferPA.setTransferCategory(transfer.getCategory());
 
-    CtMetadata ctMetadata = new CtMetadata();
-    List<CtMapEntry> transferMapEntry = ctMetadata.getMapEntry();
-    for (TransferMetadataModel transferMetadataModel : transfer.getTransferMetadata()) {
-      transferMapEntry.add(getTransferMetadata(transferMetadataModel));
+    List<TransferMetadataModel> transferMetadataModels = transfer.getTransferMetadata();
+    if(transferMetadataModels != null && !transferMetadataModels.isEmpty()) {
+      CtMetadata ctMetadata = new CtMetadata();
+      List<CtMapEntry> transferMapEntry = ctMetadata.getMapEntry();
+      for (TransferMetadataModel transferMetadataModel : transferMetadataModels) {
+        transferMapEntry.add(getTransferMetadata(transferMetadataModel));
+      }
+      transferPA.setMetadata(ctMetadata);
     }
-    transferPA.setMetadata(ctMetadata);
 
     return transferPA;
   }
@@ -558,12 +567,15 @@ private CtTransferPAV2 getTransferResponseV2(
     transferPA.setTransferAmount(BigDecimal.valueOf(transfer.getAmount()));
     transferPA.setTransferCategory(transfer.getCategory());
 
-    CtMetadata ctMetadata = new CtMetadata();
-    List<CtMapEntry> transferMapEntry = ctMetadata.getMapEntry();
-    for (TransferMetadataModel transferMetadataModel : transfer.getTransferMetadata()) {
-      transferMapEntry.add(getTransferMetadata(transferMetadataModel));
+    List<TransferMetadataModel> transferMetadataModels = transfer.getTransferMetadata();
+    if(transferMetadataModels != null && !transferMetadataModels.isEmpty()) {
+      CtMetadata ctMetadata = new CtMetadata();
+      List<CtMapEntry> transferMapEntry = ctMetadata.getMapEntry();
+      for (TransferMetadataModel transferMetadataModel : transferMetadataModels) {
+        transferMapEntry.add(getTransferMetadata(transferMetadataModel));
+      }
+      transferPA.setMetadata(ctMetadata);
     }
-    transferPA.setMetadata(ctMetadata);
 
     return transferPA;
   }