diff --git a/org.adempiere.base.process/src/org/idempiere/process/CleanOrphanCascade.java b/org.adempiere.base.process/src/org/idempiere/process/CleanOrphanCascade.java
index 978d171746..88b768e818 100644
--- a/org.adempiere.base.process/src/org/idempiere/process/CleanOrphanCascade.java
+++ b/org.adempiere.base.process/src/org/idempiere/process/CleanOrphanCascade.java
@@ -139,7 +139,7 @@ public class CleanOrphanCascade extends SvrProcess
 					String colRef = refTable.getKeyColumns()[0];
 					String colRefUU = PO.getUUIDColumnName(refTableName);
 
-					if (colRecordID != null && ! refTable.isUUIDKeyTable()) {
+					if (colRecordID != null && refTable.isIDKeyTable()) {
 						StringBuilder whereClause = new StringBuilder("AD_Table_ID=").append(refTableID)
 								.append(" AND Record_ID>0")
 								.append(" AND NOT EXISTS (SELECT ").append(colRef)
diff --git a/org.adempiere.base/src/org/idempiere/process/MoveClient.java b/org.adempiere.base/src/org/idempiere/process/MoveClient.java
index 62c8b94a60..bbb65ef79a 100644
--- a/org.adempiere.base/src/org/idempiere/process/MoveClient.java
+++ b/org.adempiere.base/src/org/idempiere/process/MoveClient.java
@@ -1170,8 +1170,10 @@ public class MoveClient extends SvrProcess {
 				return true;
 			}
 		}
-		if ("AD_ChangeLog".equalsIgnoreCase(tableName) || "AD_PInstance_Log".equalsIgnoreCase(tableName)) {
-			// skip orphan records in AD_ChangeLog and AD_PInstance_Log, can be log of deleted records, skip
+		if (   "AD_ChangeLog".equalsIgnoreCase(tableName)
+			|| "AD_PInstance".equalsIgnoreCase(tableName)
+			|| "AD_PInstance_Log".equalsIgnoreCase(tableName)) {
+			// skip orphan records in AD_ChangeLog, AD_PInstance and AD_PInstance_Log, can be log of deleted records, skip
 			return true;
 		}
 		return false;