diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl
index f545e7e..22ca324 100644
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -34,7 +34,7 @@
 		<#if appointment.Commissions??>
 			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
 				"physical_receipt_list": [
-				<#list eventRP.executionflowCustomFields.entrySet() as custom>
+				<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom>
 				{
 					"receipt_activity": "${custom.value.activity_code?json_string}",
 					"originator_code": "${custom.value.originator_code?json_string}",
diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
index 5692e04..3a6ba80 100644
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
@@ -12,7 +12,7 @@
 		<#if appointment.Commissions??>
 			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
 				"physical_receipt_list": [
-				<#list eventRP.executionflowCustomFields.entrySet() as custom>
+				<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom>
 				{
 					"receipt_activity": "${custom.value.activity_code?json_string}",
 					"originator_code": "${custom.value.originator_code?json_string}",
diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
index 16aa97a..e5b91cf 100644
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
@@ -11,7 +11,7 @@
 		<#if appointment.Commissions??>
 			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
 				"physical_receipt_list": [
-				<#list eventRP.executionflowCustomFields.entrySet() as custom>
+				<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom>
 				{
 					"receipt_activity": "${custom.value.activity_code?json_string}",
 					"originator_code": "${custom.value.originator_code?json_string}",