diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
index d46c37e4b2f7550fdf18266ef5fefc8630a33e51..40a695e3f0c0e27a2fd8f6f6c65785fefbd99b86 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
@@ -1759,7 +1759,11 @@ public function countFieldData($storage_definition, $as_bool = FALSE) {
       if ($as_bool) {
         $query->range(0, 1);
       }
-      $count = $query->countQuery()->execute()->fetchField();
+      else {
+        // Otherwise count the number of rows.
+        $query = $query->countQuery();
+      }
+      $count = $query->execute()->fetchField();
     }
     return $as_bool ? (bool) $count : (int) $count;
   }