diff --git a/web-jspack/org.openbravo.retail.giftcards/src/model/ticket/TicketExtension.js b/web-jspack/org.openbravo.retail.giftcards/src/model/ticket/TicketExtension.js
index 9180002f..3ee80c97 100644
--- a/web-jspack/org.openbravo.retail.giftcards/src/model/ticket/TicketExtension.js
+++ b/web-jspack/org.openbravo.retail.giftcards/src/model/ticket/TicketExtension.js
@@ -229,6 +229,21 @@ const updateCreditNoteForReturnPayment = (globalState, payload) => {
         sequenceNumber: creditNoteData.obposSequencenumber,
         searchKey: creditNoteData.documentNo
       };
+
+      const expirationDate = new Date();
+      // note: object destructering does not work
+      // eslint-disable-next-line prefer-destructuring
+      const gcnvCreditnoteTimelife = Terminal.terminal.gcnvCreditnoteTimelife;
+      if (gcnvCreditnoteTimelife && gcnvCreditnoteTimelife > 0) {
+        expirationDate.setDate(
+          expirationDate.getDate() + gcnvCreditnoteTimelife
+        );
+        newPayment.paymentData.creditNote.expirationDate = OB.Utilities.Date.JSToOB(
+          expirationDate,
+          'YYYY-MM-DD'
+        );
+      }
+
       return newPayment;
     }
     return p;