diff --git a/src/main/java/it/gov/pagopa/payment/notice/generator/mapper/TemplateDataMapper.java b/src/main/java/it/gov/pagopa/payment/notice/generator/mapper/TemplateDataMapper.java
index 51e96ee..980daea 100644
--- a/src/main/java/it/gov/pagopa/payment/notice/generator/mapper/TemplateDataMapper.java
+++ b/src/main/java/it/gov/pagopa/payment/notice/generator/mapper/TemplateDataMapper.java
@@ -72,13 +72,13 @@ public static PaymentNotice mapTemplate(NoticeRequestData noticeRequestData) {
                 .notice(Notice.builder()
                         .refNumber(noticeCode)
                         .cbillCode(cbill)
-                        .qrCode(
+                        .qrCode(noticeAmount != null ?
                                 generateQrCode(noticeCode,
                                 ciTaxCode,
-                                noticeAmount)
+                                noticeAmount) : null
                         )
                         .subject(noticeRequestData.getNotice().getSubject())
-                        .amount(currencyFormat(noticeAmount))
+                        .amount(noticeAmount != null ? currencyFormat(noticeAmount) : null)
                         .posteAuth(posteAuthCode)
                         .posteAccountNumber(posteAccountNumber)
                         .posteDocumentType(POSTE_DOCUMENT_TYPE_CODE)