diff --git a/Civi/DataProcessor/DataFlow/SqlDataFlow/AndClause.php b/Civi/DataProcessor/DataFlow/SqlDataFlow/AndClause.php
index 644870e544fac53476083c14c2e379afbd538550..ea867dadfa68381b2b1c63a5eb1c72eabfe7d23a 100644
--- a/Civi/DataProcessor/DataFlow/SqlDataFlow/AndClause.php
+++ b/Civi/DataProcessor/DataFlow/SqlDataFlow/AndClause.php
@@ -38,6 +38,13 @@ class AndClause extends AbstractWhereClause implements WhereClauseInterface {
     $this->clauses[] = $clause;
   }
 
+  public function hasWhereClauses(): bool {
+    if (count($this->clauses)) {
+      return true;
+    }
+    return false;
+  }
+
   /**
    * Returns the where clause
    * E.g. contact_type = 'Individual'
diff --git a/Civi/DataProcessor/DataFlow/SqlDataFlow/OrClause.php b/Civi/DataProcessor/DataFlow/SqlDataFlow/OrClause.php
index eb7cde7a30d622827af3e58d41f5c776591be807..d6cf0c4b4626f18b1b8b2936f7613bf3d488e687 100644
--- a/Civi/DataProcessor/DataFlow/SqlDataFlow/OrClause.php
+++ b/Civi/DataProcessor/DataFlow/SqlDataFlow/OrClause.php
@@ -37,6 +37,13 @@ class OrClause extends AbstractWhereClause implements WhereClauseInterface {
     $this->clauses[] = $clause;
   }
 
+  public function hasWhereClauses(): bool {
+    if (count($this->clauses)) {
+      return true;
+    }
+    return false;
+  }
+
   /**
    * Returns the where clause
    * E.g. contact_type = 'Individual'
diff --git a/Civi/DataProcessor/FilterCollection/FilterCollection.php b/Civi/DataProcessor/FilterCollection/FilterCollection.php
index 0282a50aed390afb66fb20a19693ba7da899457c..a73b9b480570db73d02770d443a58efce0a13ce6 100644
--- a/Civi/DataProcessor/FilterCollection/FilterCollection.php
+++ b/Civi/DataProcessor/FilterCollection/FilterCollection.php
@@ -194,7 +194,7 @@ class FilterCollection {
     } elseif ($this->whereClause instanceof OrClause) {
       $this->whereClause->removeWhereClause($where);
     }
-    if ($this->data_processor && $this->whereClause && !count($this->whereClause->getWhereClause())) {
+    if ($this->data_processor && $this->whereClause && !$this->whereClause->hasWhereClauses()) {
       $this->data_processor->getDataFlow()->removeWhereClause($this->whereClause);
     }
   }