diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
index e218247327..4c82c85506 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
@@ -273,7 +273,13 @@ 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 addition $field_storage parameter is passed to make this
+          // function more usable. To maintain the backwards compatibility, the
+          // additional parameter is not added to the function signature and it
+          // will be added to the function signature in 8.5.x.
+          // @todo Add the $field_storage parameter to addNextBaseTable
+          //   signature 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.";