diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl
index d551da9..a1a71c8 100644
--- a/RFXtoRP_HsaDispute.ftl
+++ b/RFXtoRP_HsaDispute.ftl
@@ -17,6 +17,7 @@
       <#assign dispute = JsonUtil.jsonToMap(dataRfx)>
        [
           <#if dispute.dispute_closed == true >
+            <#if (dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference!="")>
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -34,6 +35,7 @@
               <#else>
                 <#stop>
               </#if>
+            </#if>
           </#if>
        ]
   <#break>
diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl
index 431b6bd..91c2b6e 100644
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -52,7 +52,7 @@
                 <#if (dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030") && dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!="" >
                     <#if dispute.dispute_reception.reception_type_code=="030">
                         "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
-                         "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
+                        "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
                     <#else>
                         <#if dispute.dispute_reception.reception_type_code=="070">
                             "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",