diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
index bffb8ec..adc340a 100644
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@@ -54,10 +54,14 @@
           "DateTime": "${receipt_creation_datetime}",
           "AuthorTimeZone": "${time_zone_rfx}"
           },
-        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" && receipt.receipt_reference?? && receipt.receipt_reference!="">
           "OrderID": "${receipt.receipt_reference?trim?json_string}",
         <#else>
-          "OrderID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+          <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+            "OrderID": "${receipt.receipt_reference?trim?json_string}",
+          <#else>
+            "OrderID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+          </#if>
         </#if>
         <#-- Header Metadata inclusion -->
         <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,