diff --git a/base/src/org/adempiere/model/ExportModelValidator.java b/base/src/org/adempiere/model/ExportModelValidator.java
index 9e33cbc9d5..0df7c78582 100644
--- a/base/src/org/adempiere/model/ExportModelValidator.java
+++ b/base/src/org/adempiere/model/ExportModelValidator.java
@@ -132,6 +132,7 @@ public class ExportModelValidator implements ModelValidator
 
 			for (X_AD_ReplicationTable rplTable : rplStrategy.getReplicationTables()) {
 				if (X_AD_ReplicationTable.REPLICATIONTYPE_Merge.equals(rplTable.getReplicationType())
+					|| X_AD_ReplicationTable.REPLICATIONTYPE_Broadcast.equals(rplTable.getReplicationType())
 					|| X_AD_ReplicationTable.REPLICATIONTYPE_Reference.equals(rplTable.getReplicationType())) 
 				{
 				    String tableName = MTable.getTableName(client.getCtx(), rplTable.getAD_Table_ID());
diff --git a/base/src/org/adempiere/process/rpl/imp/ImportHelper.java b/base/src/org/adempiere/process/rpl/imp/ImportHelper.java
index 5cfe4aa9ae..85d26db350 100755
--- a/base/src/org/adempiere/process/rpl/imp/ImportHelper.java
+++ b/base/src/org/adempiere/process/rpl/imp/ImportHelper.java
@@ -179,13 +179,13 @@ public class ImportHelper {
         			{
         				if(X_AD_ReplicationTable.REPLICATIONTYPE_Broadcast.equals(ReplicationType))
         				{
-        				    po.saveReplica(true);
-        					MReplicationStrategy rplStrategy = new MReplicationStrategy(client.getCtx(), client.getAD_ReplicationStrategy_ID(), null);
+        					MReplicationStrategy rplStrategy = new MReplicationStrategy(client.getCtx(), client.getAD_ReplicationStrategy_ID(), po.get_TrxName());
         					ExportHelper expHelper = new ExportHelper(client, rplStrategy);
         					expHelper.exportRecord(	po, 
         								MReplicationStrategy.REPLICATION_TABLE,
         								X_AD_ReplicationTable.REPLICATIONTYPE_Merge,
         								ModelValidator.TYPE_AFTER_CHANGE);
+        					po.saveReplica(true);
         					
         				}
         				else if(X_AD_ReplicationTable.REPLICATIONTYPE_Merge.equals(ReplicationType)