diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
index d459bbc..b0f9351 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -35,7 +35,7 @@
         },
        "ShipFromAcked": true,
          "ShipTo": {
-          <#if preparation_order.preparation_type_code == "030" && preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot!="">
+          <#if preparation_order.preparation_type_code == "030" && optional_attributes.preparation_order.intermediate_consignee_transfer_physical_depot?? && optional_attributes.preparation_order.intermediate_consignee_transfer_physical_depot!="" && optional_attributes.preparation_order.transfer_intermediate_consignee==true>
             "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_transfer_physical_depot?json_string)}"
           <#else>
             <#if preparation_order.preparation_type_code == "030">