diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
index 4f0c562..b913fa3 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
@@ -1628,9 +1628,7 @@ public function countFieldData($storage_definition, $as_bool = FALSE) {
 
     // @todo Find a way to count field data also for fields having custom
     //   storage. See https://www.drupal.org/node/2337753.
-    if (isset($query)) {
-      $query = $query->countQuery();
-    }
+    $query = $query->countQuery();
     $count = $query->execute()->fetchField();
 
     return $as_bool ? (bool) $count : (int) $count;