diff --git a/org.adempiere.base/src/org/compiere/model/GridTable.java b/org.adempiere.base/src/org/compiere/model/GridTable.java
index 8d29a88dfd..9fd586597a 100644
--- a/org.adempiere.base/src/org/compiere/model/GridTable.java
+++ b/org.adempiere.base/src/org/compiere/model/GridTable.java
@@ -2845,11 +2845,7 @@ public class GridTable extends AbstractTableModel
 		if (retainedWhere != null)
 		{
 			String whereClause = m_whereClause;
-			if (m_whereClause == null || m_whereClause.trim().length() == 0)
-			{
-				m_whereClause = retainedWhere;
-			}
-			else
+			if (m_whereClause != null && m_whereClause.trim().length() > 0)
 			{
 				m_whereClause = "(" + m_whereClause + ") OR (" + retainedWhere + ") ";
 			}