diff --git a/src/applications/search/engine/PhabricatorSearchEngineElastic.php b/src/applications/search/engine/PhabricatorSearchEngineElastic.php
index d7036a1b09..299e5d6cdf 100644
--- a/src/applications/search/engine/PhabricatorSearchEngineElastic.php
+++ b/src/applications/search/engine/PhabricatorSearchEngineElastic.php
@@ -18,11 +18,21 @@
 
 final class PhabricatorSearchEngineElastic extends PhabricatorSearchEngine {
   private $uri;
+  private $timeout;
 
   public function __construct($uri) {
     $this->uri = $uri;
   }
 
+  public function setTimeout($timeout) {
+    $this->timeout = $timeout;
+    return $this;
+  }
+
+  public function getTimeout() {
+    return $this->timeout;
+  }
+
   public function reindexAbstractDocument(
     PhabricatorSearchAbstractDocument $doc) {
 
@@ -206,6 +216,10 @@ final class PhabricatorSearchEngineElastic extends PhabricatorSearchEngine {
       $future->setMethod('GET');
     }
 
+    if ($this->getTimeout()) {
+      $future->setTimeout($this->getTimeout());
+    }
+
     list($body) = $future->resolvex();
 
     if ($is_write) {