diff --git a/src/controllers/install.js b/src/controllers/install.js
index b55d32827..505ed20f9 100644
--- a/src/controllers/install.js
+++ b/src/controllers/install.js
@@ -185,6 +185,7 @@ installController.install = function (req, res) {
               )
             },
             function (done) {
+              if (!eHost) return done()
               SettingsSchema.create(
                 {
                   name: 'es:host',
@@ -194,6 +195,7 @@ installController.install = function (req, res) {
               )
             },
             function (done) {
+              if (!ePort) return done()
               SettingsSchema.create(
                 {
                   name: 'es:port',
diff --git a/src/elasticsearch/index.js b/src/elasticsearch/index.js
index 6d9688450..a284e5eab 100644
--- a/src/elasticsearch/index.js
+++ b/src/elasticsearch/index.js
@@ -39,16 +39,16 @@ function checkConnection (callback) {
   )
 }
 
-// ES.testConnection = function (callback) {
-//   if (process.env.ELATICSEARCH_URI) ES.host = process.env.ELATICSEARCH_URI
-//   else ES.host = nconf.get('elasticsearch:host') + ':' + nconf.get('elasticsearch:port')
-//
-//   ES.esclient = new elasticsearch.Client({
-//     host: ES.host
-//   })
-//
-//   checkConnection(callback)
-// }
+ES.testConnection = function (callback) {
+  if (process.env.ELATICSEARCH_URI) ES.host = process.env.ELATICSEARCH_URI
+  else ES.host = nconf.get('elasticsearch:host') + ':' + nconf.get('elasticsearch:port')
+
+  ES.esclient = new elasticsearch.Client({
+    host: ES.host
+  })
+
+  checkConnection(callback)
+}
 
 ES.setupHooks = function () {
   var ticketSchema = require('../models/ticket')