diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListModelTable.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListModelTable.java
index 43a8ce678b..ccab75bfd2 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListModelTable.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListModelTable.java
@@ -279,6 +279,9 @@ public class ListModelTable extends ListModelList<Object> implements Sortable<Ob
 		}
 		else
 		{
+			//hot fix for:IDEMPIERE-2154 wait complete solution from zk update
+			if (rowCount == 0)
+				clearSelection();
 			removeRange(rowCount, currentSize);
 		}
 	}