diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
index 6368b080..d9d7bee 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
@@ -377,6 +377,17 @@ public function onEntityTypeDelete(EntityTypeInterface $entity_type) {
 
     // Delete the entity schema.
     $this->deleteEntitySchemaData($entity_type);
+
+    // Get all storage definitions.
+    $schema = $this->installedStorageSchema()->getAll();
+
+    // Delete storage definitions for the deleted entity.
+    foreach (array_keys($schema) as $storage_definition_name) {
+      $entity_type_id = substr($storage_definition_name, 0, strpos($storage_definition_name, '.'));
+      if($entity_type_id == $entity_type->id()) {
+        $this->installedStorageSchema()->delete($storage_definition_name);
+      }
+    }
   }
 
   /**
diff --git a/core/modules/system/src/Tests/Entity/EntitySchemaTest.php b/core/modules/system/src/Tests/Entity/EntitySchemaTest.php
index 5ce61be..46245f5 100644
--- a/core/modules/system/src/Tests/Entity/EntitySchemaTest.php
+++ b/core/modules/system/src/Tests/Entity/EntitySchemaTest.php
@@ -139,4 +139,42 @@ public function testModifyingTranslatableColumnSchema() {
     }
   }
 
+  /**
+   * Tests fields from an uninstalled module are removed from the schema.
+   */
+  public function testCleanUpStorageDefinition() {
+    // Find all the entity types provided by the entity_test module and install
+    // the schema for them.
+
+    $entity_type_ids =[];
+    $entities = \Drupal::entityManager()->getDefinitions();
+    foreach ($entities as $name => $definition) {
+      if ($definition->getProvider() == 'entity_test') {
+        $this->installEntitySchema($name);
+        $entity_type_ids[] = $name;
+      };
+    }
+
+    // Uninstall the entity_test module.
+    $this->container->get('module_installer')->uninstall(array('entity_test'));
+
+    // Get a list of all the entities in the schema.
+    $key_value_store = \Drupal::keyValue('entity.storage_schema.sql');
+    $schema = $key_value_store->getAll();
+
+    $item_count = 0;
+
+    // Count the storage definitions that come from entity types provided by
+    // the entity_test module.
+    foreach (array_keys($schema) as $storage_definition_name) {
+      $entity_item = substr($storage_definition_name, 0, strpos($storage_definition_name, '.'));
+      if (in_array($entity_item, $entity_type_ids)) {
+        $item_count++;
+      }
+    }
+
+    // Ensure that all storage definitions have been removed from the schema.
+    $this->assertEqual($item_count, 0, 'After uninstalling entity_test module the schema still contains fields from entities provided by this module.');
+  }
+
 }