diff --git a/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php
index f428bbf961e3b..b6ec06d48a487 100644
--- a/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php
@@ -293,7 +293,8 @@ public function deleteMapping($index, $entityType)
      */
     public function query($query)
     {
-        return $this->client->search($query);
+        $params = array_merge($query, ['client' => ['timeout' => $this->clientOptions['timeout']]]);
+        return $this->client->search($params);
     }
 
     /**