diff --git a/org.adempiere.base/src/org/compiere/model/MTable.java b/org.adempiere.base/src/org/compiere/model/MTable.java
index de34054496..526f290ec5 100644
--- a/org.adempiere.base/src/org/compiere/model/MTable.java
+++ b/org.adempiere.base/src/org/compiere/model/MTable.java
@@ -619,6 +619,7 @@ public class MTable extends X_AD_Table
 	 */
 	public static boolean isZeroIDTable(String tablename) {
 		return (tablename.equals("AD_Org") ||
+				tablename.equals("AD_Client") || // IDEMPIERE-668
 				tablename.equals("AD_ReportView") ||
 				tablename.equals("AD_Role") ||
 				tablename.equals("AD_System") ||