diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
index d8d4a8e..4f0c562 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
@@ -1600,8 +1600,7 @@ public function countFieldData($storage_definition, $as_bool = FALSE) {
         $or->isNotNull($table_mapping->getFieldColumnName($storage_definition, $column_name));
       }
       $query
-        ->condition($or)
-        ->fields('t', array('entity_id'));
+        ->condition($or);
     }
     elseif ($table_mapping->allowsSharedTableStorage($storage_definition)) {
       // Ascertain the table this field is mapped too.
@@ -1622,8 +1621,9 @@ public function countFieldData($storage_definition, $as_bool = FALSE) {
         $or->isNotNull($table_mapping->getFieldColumnName($storage_definition, $property_name));
       }
       $query->condition($or);
-      $query
-        ->fields('t', array($this->idKey));
+    }
+    else {
+      $query = $this->database->select($table_name, 't');
     }
 
     // @todo Find a way to count field data also for fields having custom