diff --git a/core/modules/entity/lib/Drupal/entity/EntityFieldQuery.php b/core/modules/entity/lib/Drupal/entity/EntityFieldQuery.php
index 68b40b9..add8a38 100644
--- a/core/modules/entity/lib/Drupal/entity/EntityFieldQuery.php
+++ b/core/modules/entity/lib/Drupal/entity/EntityFieldQuery.php
@@ -849,7 +849,8 @@ class EntityFieldQuery {
         $this->addCondition($select_query, $base_table . '.' . $sql_field, $this->entityConditions['bundle'], $having);
       }
       else {
-        $this->addCondition($select_query, $sql_field, $this->entityConditions['bundle'], $having);
+        // This entity has no bundle, so invalidate the query.
+        $select_query->where('1 = 0');
       }
     }