diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
index 3b3abae2a04..aa0c148c9f2 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
@@ -1502,6 +1502,9 @@ protected function processFieldStorageSchema(array &$field_storage_schema) {
     // Clean up some schema properties that should not be taken into account
     // after a field storage has been created.
     foreach ($field_storage_schema as $table_name => $table_schema) {
+      if (empty($table_schema['fields'])) {
+        continue;
+      }
       foreach ($table_schema['fields'] as $key => $schema) {
         unset($field_storage_schema[$table_name]['fields'][$key]['initial']);
         unset($field_storage_schema[$table_name]['fields'][$key]['initial_from_field']);