diff --git a/framework/default/fflib/default/classes/common/fflib_QueryFactory.cls b/framework/default/fflib/default/classes/common/fflib_QueryFactory.cls
index 2d2cc425322..0ac00d30090 100644
--- a/framework/default/fflib/default/classes/common/fflib_QueryFactory.cls
+++ b/framework/default/fflib/default/classes/common/fflib_QueryFactory.cls
@@ -660,7 +660,7 @@ public class fflib_QueryFactory { //No explicit sharing declaration - inherit fr
 			}	
 		}
 		result += ' FROM ' + (relationship != null ? relationship.getRelationshipName() : table.getDescribe().getName());
-		if(conditionExpression != null)
+		if( String.isNotBlank( conditionExpression ) )
 			result += ' WHERE '+conditionExpression;
 
 		if(order.size() > 0){