diff --git a/core/modules/taxonomy/src/TermStorageSchema.php b/core/modules/taxonomy/src/TermStorageSchema.php
index 0aa097bcf7..d8e8da3f15 100644
--- a/core/modules/taxonomy/src/TermStorageSchema.php
+++ b/core/modules/taxonomy/src/TermStorageSchema.php
@@ -60,10 +60,16 @@ protected function getEntitySchema(ContentEntityTypeInterface $entity_type, $res
           'not null' => TRUE,
           'default' => 0,
         ],
+        'langcode' => [
+          'description' => 'The langcode of the node.',
+          'type' => 'varchar_ascii',
+          'length' => 12,
+          'not null' => TRUE,
+        ],
       ],
-      'primary key' => ['nid', 'tid'],
+      'primary key' => ['nid', 'tid', 'langcode'],
       'indexes' => [
-        'term_node' => ['tid', 'status', 'sticky', 'created'],
+        'term_node' => ['tid', 'status', 'sticky', 'created', 'langcode'],
       ],
       'foreign keys' => [
         'tracked_node' => [
diff --git a/core/modules/taxonomy/src/TermViewsData.php b/core/modules/taxonomy/src/TermViewsData.php
index 73e8cbc007..461b3913ad 100644
--- a/core/modules/taxonomy/src/TermViewsData.php
+++ b/core/modules/taxonomy/src/TermViewsData.php
@@ -212,6 +212,17 @@ public function getViewsData() {
       ],
     ];
 
+    $data['taxonomy_index']['langcode'] = [
+      'title' => $this->t('Node language'),
+      'help' => $this->t('The langcode of the node.'),
+      'filter' => [
+        'id' => 'language',
+      ],
+      'sort' => [
+        'id' => 'standard',
+      ],
+    ];
+
     $data['taxonomy_index']['created'] = [
       'title' => $this->t('Post date'),
       'help' => $this->t('The date the content related to a term was posted.'),
diff --git a/core/modules/taxonomy/taxonomy.install b/core/modules/taxonomy/taxonomy.install
index bcf64aca5d..4b87753b53 100644
--- a/core/modules/taxonomy/taxonomy.install
+++ b/core/modules/taxonomy/taxonomy.install
@@ -8,6 +8,7 @@
 use Drupal\Core\Entity\Sql\SqlEntityStorageInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Site\Settings;
+use Drupal\Core\Database\Database;
 
 /**
  * Convert the custom taxonomy term hierarchy storage to a default storage.
@@ -248,3 +249,96 @@ function taxonomy_update_8702(&$sandbox) {
   }
   $sandbox['#finished'] = empty($sandbox['max']) ? 1 : ($sandbox['current'] / $sandbox['max']);
 }
+
+/**
+ * Add 'langcode' field to 'taxonomy_index' entities.
+ *
+ * Content needs to be updated.
+ */
+function taxonomy_update_8703() {
+  if (!Database::getConnection()->schema()->fieldExists('taxonomy_index', 'langcode')) {
+    $language = \Drupal::languageManager()->getCurrentLanguage()->getId();
+    Database::getConnection()->schema()->addField('taxonomy_index', 'langcode', [
+      'description' => 'The langcode of the node.',
+      'type' => 'varchar_ascii',
+      'length' => 12,
+      'not null' => TRUE,
+      'default' => $language,
+    ]);
+
+    Database::getConnection()->schema()->dropPrimaryKey('taxonomy_index');
+    Database::getConnection()->schema()->addPrimaryKey(
+      'taxonomy_index',
+      ['nid', 'tid', 'langcode']
+    );
+
+    Database::getConnection()->schema()->dropIndex('taxonomy_index', 'term_node');
+    Database::getConnection()->schema()->addIndex(
+      'taxonomy_index',
+      'term_node',
+      ['tid', 'status', 'sticky', 'created', 'langcode'],
+      [
+        'description' => 'Maintains denormalized information about node/term relationships.',
+        'fields' => [
+          'nid' => [
+            'description' => 'The {node}.nid this record tracks.',
+            'type' => 'int',
+            'unsigned' => TRUE,
+            'not null' => TRUE,
+            'default' => 0,
+          ],
+          'tid' => [
+            'description' => 'The term ID.',
+            'type' => 'int',
+            'unsigned' => TRUE,
+            'not null' => TRUE,
+            'default' => 0,
+          ],
+          'status' => [
+            'description' => 'Boolean indicating whether the node is published (visible to non-administrators).',
+            'type' => 'int',
+            'not null' => TRUE,
+            'default' => 1,
+          ],
+          'sticky' => [
+            'description' => 'Boolean indicating whether the node is sticky.',
+            'type' => 'int',
+            'not null' => FALSE,
+            'default' => 0,
+            'size' => 'tiny',
+          ],
+          'created' => [
+            'description' => 'The Unix timestamp when the node was created.',
+            'type' => 'int',
+            'not null' => TRUE,
+            'default' => 0,
+          ],
+          'langcode' => [
+            'description' => 'The langcode of the node.',
+            'type' => 'varchar_ascii',
+            'length' => 12,
+            'not null' => TRUE,
+          ],
+        ],
+        'primary key' => ['nid', 'tid', 'langcode'],
+        'indexes' => [
+          'term_node' => ['tid', 'status', 'sticky', 'created', 'langcode'],
+        ],
+        'foreign keys' => [
+          'tracked_node' => [
+            'table' => 'node',
+            'columns' => ['nid' => 'nid'],
+          ],
+          'term' => [
+            'table' => 'taxonomy_term_data',
+            'columns' => ['tid' => 'tid'],
+          ],
+        ],
+      ]
+    );
+  }
+
+  $manager = \Drupal::entityDefinitionUpdateManager();
+  $entity_type = $manager->getEntityType('taxonomy_term');
+  $manager->updateEntityType($entity_type);
+}
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 24abc7dd68..c2562e9b61 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -532,7 +532,7 @@ function taxonomy_build_node_index($node) {
         foreach ($node->getTranslationLanguages() as $language) {
           foreach ($node->getTranslation($language->getId())->$field_name as $item) {
             if (!$item->isEmpty()) {
-              $tid_all[$item->target_id] = $item->target_id;
+              $tid_all[$item->target_id][$language->getId()] = $item->target_id;
             }
           }
         }
@@ -541,11 +541,13 @@ function taxonomy_build_node_index($node) {
     // Insert index entries for all the node's terms.
     if (!empty($tid_all)) {
       $connection = \Drupal::database();
-      foreach ($tid_all as $tid) {
-        $connection->merge('taxonomy_index')
-          ->key(['nid' => $node->id(), 'tid' => $tid, 'status' => $node->isPublished()])
-          ->fields(['sticky' => $sticky, 'created' => $node->getCreatedTime()])
-          ->execute();
+      foreach ($tid_all as $tid_info) {
+        foreach ($tid_info as $langcode => $tid) {
+          $connection->merge('taxonomy_index')
+            ->key(['nid' => $node->id(), 'tid' => $tid, 'status' => $node->isPublished(), 'langcode' => $langcode])
+            ->fields(['sticky' => $sticky, 'created' => $node->getCreatedTime()])
+            ->execute();
+        }
       }
     }
   }
@@ -580,7 +582,10 @@ function taxonomy_node_predelete(EntityInterface $node) {
  */
 function taxonomy_delete_node_index(EntityInterface $node) {
   if (\Drupal::config('taxonomy.settings')->get('maintain_index_table')) {
-    \Drupal::database()->delete('taxonomy_index')->condition('nid', $node->id())->execute();
+    \Drupal::database()->delete('taxonomy_index')
+      ->condition('nid', $node->id())
+      ->condition('langcode', $node->language()->getId())
+      ->execute();
   }
 }