diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index d94b689bb5..cc8c98c87a 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -18,7 +18,7 @@
 use Statamic\Facades\User;
 use Statamic\Http\Resources\CP\Entries\EntriesFieldtypeEntries;
 use Statamic\Http\Resources\CP\Entries\EntriesFieldtypeEntry as EntryResource;
-use Statamic\Query\EmptyQueryBuilder;
+use Statamic\Query\EmptyEntryQueryBuilder;
 use Statamic\Query\OrderedQueryBuilder;
 use Statamic\Query\Scopes\Filter;
 use Statamic\Query\Scopes\Filters\Concerns\QueriesFilters;
@@ -339,7 +339,7 @@ protected function collect($value)
     private function queryBuilder($values)
     {
         if (! $values) {
-            return new StatusQueryBuilder(new EmptyQueryBuilder());
+            return new StatusQueryBuilder(new EmptyEntryQueryBuilder());
         }
 
         $site = Site::current()->handle();
diff --git a/src/Query/EmptyEntryQueryBuilder.php b/src/Query/EmptyEntryQueryBuilder.php
new file mode 100644
index 0000000000..49f58877a3
--- /dev/null
+++ b/src/Query/EmptyEntryQueryBuilder.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Statamic\Query;
+
+use Statamic\Contracts\Entries\QueryBuilder;
+use Statamic\Stache\Query\QueriesTaxonomizedEntries;
+
+class EmptyEntryQueryBuilder extends EmptyQueryBuilder implements QueryBuilder
+{
+    use QueriesTaxonomizedEntries;
+
+    public function whereStatus($status)
+    {
+        return $this;
+    }
+}
diff --git a/src/Query/EmptyQueryBuilder.php b/src/Query/EmptyQueryBuilder.php
index 8ec78ac758..8e493aca0d 100644
--- a/src/Query/EmptyQueryBuilder.php
+++ b/src/Query/EmptyQueryBuilder.php
@@ -8,9 +8,4 @@ protected function getBaseItems()
     {
         return collect([]);
     }
-
-    public function whereStatus($status)
-    {
-        return $this;
-    }
 }
diff --git a/src/Stache/Query/QueriesEntryStatus.php b/src/Stache/Query/QueriesEntryStatus.php
index 5c7a483578..d80cd93e1d 100644
--- a/src/Stache/Query/QueriesEntryStatus.php
+++ b/src/Stache/Query/QueriesEntryStatus.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Collection;
 use Statamic\Exceptions\InvalidQueryDateException;
-use Statamic\Query\EmptyQueryBuilder;
+use Statamic\Query\EmptyEntryQueryBuilder;
 
 trait QueriesEntryStatus
 {
@@ -32,7 +32,7 @@ public function whereStatus(string $status)
                 try {
                     return $query->orWhere(fn ($q) => $this->addCollectionStatusLogicToQuery($q, $status, $collection));
                 } catch (InvalidQueryDateException $e) {
-                    return new EmptyQueryBuilder();
+                    return new EmptyEntryQueryBuilder();
                 }
             })
         );