diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
index 7ac9c7b..c1ac775 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
@@ -361,7 +361,7 @@ public function getTableMapping(array $storage_definitions = NULL) {
 
       // Add dedicated tables.
       $dedicated_table_definitions = array_filter($definitions, function (FieldStorageDefinitionInterface $definition) use ($table_mapping) {
-        return $table_mapping->requiresDedicatedTableStorage($definition) && $definition->isBaseField();
+        return $table_mapping->requiresDedicatedTableStorage($definition);
       });
       $extra_columns = array(
         'bundle',