diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
index 2f770aede1..0f63eb3ed7 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
@@ -167,6 +167,10 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
    *   name.
    */
   public function getFieldStorageDefinitions() {
+    if ($last_installed_definitions = $this->entityLastInstalledSchemaRepository->getLastInstalledFieldStorageDefinitions($this->entityTypeId)) {
+      return $last_installed_definitions;
+    }
+
     return $this->entityFieldManager->getBaseFieldDefinitions($this->entityTypeId);
   }
 
@@ -207,6 +211,10 @@ public function __construct(EntityTypeInterface $entity_type, Connection $databa
     }
     $this->entityTypeManager = $entity_type_manager;
 
+    if ($last_installed_definition = $entity_last_installed_schema_repository->getLastInstalledDefinition($this->entityTypeId)) {
+      $this->entityType = $last_installed_definition;
+    }
+
     $this->initTableLayout();
   }