diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
index 5d1bc29..70df7b1 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
@@ -591,22 +591,35 @@ protected function getEntitySchemaTables() {
    *   storage definitions.
    */
   protected function getEntitySchemaData(ContentEntityTypeInterface $entity_type, array $schema) {
-    $schema_data = array();
     $entity_type_id = $entity_type->id();
     $keys = array('indexes', 'unique keys');
     $unused_keys = array_flip(array('description', 'fields', 'foreign keys'));
 
+    // Collect all possible field schema identifiers for shared table fields.
+    // These will be used to detect entity schema data in the following loop.
+    $field_schema_identifiers = [];
+    $storage_definitions = $this->entityManager->getFieldStorageDefinitions($entity_type_id);
+    $table_mapping = $this->storage->getTableMapping($storage_definitions);
+    foreach ($storage_definitions as $field_name => $storage_definition) {
+      if ($table_mapping->allowsSharedTableStorage($storage_definition)) {
+        // Make sure both base identifier names and suffixed names are listed.
+        $name = $this->getFieldSchemaIdentifierName($entity_type_id, $field_name);
+        $field_schema_identifiers[$name] = $name;
+        foreach ($storage_definition->getColumns() as $key => $columns) {
+          $name = $this->getFieldSchemaIdentifierName($entity_type_id, $field_name, $key);
+          $field_schema_identifiers[$name] = $name;
+        }
+      }
+    }
+
+    $schema_data = [];
     foreach ($schema as $table_name => $table_schema) {
       $table_schema = array_diff_key($table_schema, $unused_keys);
       foreach ($keys as $key) {
         // Exclude data generated from field storage definitions, we will check
         // that separately.
-        if (!empty($table_schema[$key])) {
-          $data_keys = array_keys($table_schema[$key]);
-          $entity_keys = array_filter($data_keys, function ($key) use ($entity_type_id) {
-            return strpos($key, $entity_type_id . '_field__') !== 0;
-          });
-          $table_schema[$key] = array_intersect_key($table_schema[$key], array_flip($entity_keys));
+        if ($field_schema_identifiers && !empty($table_schema[$key])) {
+          $table_schema[$key] = array_diff_key($table_schema[$key], $field_schema_identifiers);
         }
       }
       $schema_data[$table_name] = array_filter($table_schema);
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php b/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php
new file mode 100644
index 0000000..50f8d2c
--- /dev/null
+++ b/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\content_translation\Tests\ContentTranslationEnableTest.
+ */
+
+namespace Drupal\content_translation\Tests;
+
+use Drupal\simpletest\KernelTestBase;
+
+/**
+ * Test enabling content translation after other modules.
+ *
+ * @group content_translation
+ */
+class ContentTranslationEnableTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['entity_test', 'user', 'text'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('entity_test_mul');
+    \Drupal::entityDefinitionUpdateManager()->applyUpdates();
+  }
+
+  /**
+   * Tests that entity schemas are up-to-date after enabling translation.
+   */
+  public function testEnable() {
+    // Enable modules and make sure the related config entity type definitions
+    // are installed.
+    $this->enableModules(['content_translation', 'language']);
+    \Drupal::entityDefinitionUpdateManager()->applyUpdates();
+
+    // No pending updates should be available.
+    $this->assertFalse(\Drupal::entityDefinitionUpdateManager()->needsUpdates());
+
+    // Enable translation on a new entity type.
+    \Drupal::service('content_translation.manager')->setEnabled('entity_test_mul', 'entity_test_mul', TRUE);
+    drupal_static_reset();
+    \Drupal::entityManager()->clearCachedDefinitions();
+
+    // No pending updates should be available.
+    $this->assertFalse(\Drupal::entityDefinitionUpdateManager()->needsUpdates());
+  }
+
+}
