diff --git a/src/applications/search/engine/PhabricatorSearchEngineElastic.php b/src/applications/search/engine/PhabricatorSearchEngineElastic.php
index f8561f0f28..d7036a1b09 100644
--- a/src/applications/search/engine/PhabricatorSearchEngineElastic.php
+++ b/src/applications/search/engine/PhabricatorSearchEngineElastic.php
@@ -17,6 +17,11 @@
  */
 
 final class PhabricatorSearchEngineElastic extends PhabricatorSearchEngine {
+  private $uri;
+
+  public function __construct($uri) {
+    $this->uri = $uri;
+  }
 
   public function reindexAbstractDocument(
     PhabricatorSearchAbstractDocument $doc) {
@@ -183,8 +188,7 @@ final class PhabricatorSearchEngineElastic extends PhabricatorSearchEngine {
   }
 
   private function executeRequest($path, array $data, $is_write = false) {
-    $uri = PhabricatorEnv::getEnvConfig('search.elastic.host');
-    $uri = new PhutilURI($uri);
+    $uri = new PhutilURI($this->uri);
     $data = json_encode($data);
 
     $uri->setPath($path);
diff --git a/src/applications/search/selector/PhabricatorDefaultSearchEngineSelector.php b/src/applications/search/selector/PhabricatorDefaultSearchEngineSelector.php
index 5cea7585d4..8e2a214982 100644
--- a/src/applications/search/selector/PhabricatorDefaultSearchEngineSelector.php
+++ b/src/applications/search/selector/PhabricatorDefaultSearchEngineSelector.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,9 @@ final class PhabricatorDefaultSearchEngineSelector
   extends PhabricatorSearchEngineSelector {
 
   public function newEngine() {
-    if (PhabricatorEnv::getEnvConfig('search.elastic.host')) {
-      return new PhabricatorSearchEngineElastic();
+    $elastic_host = PhabricatorEnv::getEnvConfig('search.elastic.host');
+    if ($elastic_host) {
+      return new PhabricatorSearchEngineElastic($elastic_host);
     }
     return new PhabricatorSearchEngineMySQL();
   }