diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
index e21824732736856649b9bd6d2e2c7651e15c2876..95a766f32723f1163e0a381c2fcc14240d841656 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
@@ -273,7 +273,15 @@ public function addField($field, $type, $langcode) {
           $entity_type = $this->entityManager->getDefinition($entity_type_id);
           $field_storage_definitions = $this->entityManager->getFieldStorageDefinitions($entity_type_id);
           // Add the new entity base table using the table and sql column.
-          $base_table = $this->addNextBaseTable($entity_type, $table, $sql_column);
+          // An additional $field_storage argument is being passed to
+          // addNextBaseTable() in order to improve its functionality, for
+          // example by allowing extra processing based on the field type of the
+          // storage. In order to maintain backwards compatibility in 8.4.x, the
+          // new argument has not been added to the signature of that method,
+          // and it will be added only in 8.5.x.
+          // @todo Add the $field_storage argument to addNextBaseTable() in
+          //   8.5.x. https://www.drupal.org/node/2909425
+          $base_table = $this->addNextBaseTable($entity_type, $table, $sql_column, $field_storage);
           $propertyDefinitions = [];
           $key++;
           $index_prefix .= "$next_index_prefix.";