diff --git a/core/modules/views/views.views.inc b/core/modules/views/views.views.inc
index abbbf31..1ea24ff 100644
--- a/core/modules/views/views.views.inc
+++ b/core/modules/views/views.views.inc
@@ -357,6 +357,7 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
   if ($data_table) {
     // Tell Views how to join to the base table, via the data table.
     $data[$table_alias]['table']['join'][$data_table] = array(
+      'table' => $table_mapping->getDedicatedDataTableName($field_storage),
       'left_field' => $entity_type->getKey('id'),
       'field' => 'entity_id',
       'extra' => array(
@@ -368,6 +369,7 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
   else {
     // If there is no data table, just join directly.
     $data[$table_alias]['table']['join'][$base_table] = array(
+      'table' => $table_mapping->getDedicatedDataTableName($field_storage),
       'left_field' => $entity_type->getKey('id'),
       'field' => 'entity_id',
       'extra' => array(
@@ -381,6 +383,7 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
     if ($entity_revision_data_table) {
       // Tell Views how to join to the revision table, via the data table.
       $data[$table_alias]['table']['join'][$entity_revision_data_table] = array(
+        'table' => $table_mapping->getDedicatedDataTableName($field_storage),
         'left_field' => $entity_type->getKey('revision'),
         'field' => 'revision_id',
         'extra' => array(
@@ -392,6 +395,7 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
     else {
       // If there is no data table, just join directly.
       $data[$table_alias]['table']['join'][$entity_revision_table] = array(
+        'table' => $table_mapping->getDedicatedDataTableName($field_storage),
         'left_field' => $entity_type->getKey('revision'),
         'field' => 'revision_id',
         'extra' => array(