diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl
index 23998f4..e16c546 100644
--- a/RFXtoRP_HsaCons_ActorCreated.ftl
+++ b/RFXtoRP_HsaCons_ActorCreated.ftl
@@ -29,6 +29,7 @@
         "StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data?json_string}",
         "PostalCode" : "${actor.consignee_structured_address.postal_code?json_string}",
         "City" : "${actor.consignee_structured_address.post_code_area_name?json_string}",
+        <#assign isCountryCode = isCountryCode(preparation_line.countryCode) />
          <#if isCountryCode>
             "CountryCode" : "${actor.consignee_structured_address.country_code?json_string}",
           <#else>
diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl
index 7b5f47b..ae85613 100644
--- a/RFXtoRP_HsaSup_ActorCreated.ftl
+++ b/RFXtoRP_HsaSup_ActorCreated.ftl
@@ -28,6 +28,7 @@
           "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}",
          "PostalCode" : "${actor.supplier_structured_address.postal_code?json_string}",
           "City" : "${actor.supplier_structured_address.post_code_area_name?json_string}",
+          <#assign isCountryCode = isCountryCode(preparation_line.countryCode) />
           <#if isCountryCode>
             "CountryCode" : "${actor.supplier_structured_address.country_code?json_string}",
           <#else>
diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl
index 1eb3941..4213196 100644
--- a/RFXtoRP_HsrDepot_ActorCreated.ftl
+++ b/RFXtoRP_HsrDepot_ActorCreated.ftl
@@ -28,7 +28,8 @@
           "StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}",
           "PostalCode" : "${depot.physical_depot_structured_address.postal_code?json_string}",
           "City" : "${depot.physical_depot_structured_address.post_code_area_name?json_string}",
-          <#if isCountryCode>
+          <#assign isCountryCode = isCountryCode(preparation_line.countryCode) />
+          <#if isCountryCode >
             "CountryCode" : "${depot.physical_depot_structured_address.country_code?json_string}",
           <#else>
             "CountryCode" : "",