diff --git a/lib/esConnector.js b/lib/esConnector.js
index 77ce1e1..c5efc8d 100755
--- a/lib/esConnector.js
+++ b/lib/esConnector.js
@@ -126,25 +126,23 @@ ESConnector.prototype.connect = function (callback) {
       if (error) {
         console.log('ESConnector.prototype.connect', 'ping', 'failed', error);
         log('ESConnector.prototype.connect', 'ping', 'failed', error);
-        callback(null, self.db);
-      } else {
-        if (self.settings.mappingProperties) {
-          self.setupMappings()
-            .then(function () {
-              log('ESConnector.prototype.connect', 'setupMappings', 'finished');
-              callback && callback(null, self.db);
-            })
-            .catch(function (err) {
-              log('ESConnector.prototype.connect', 'setupMappings', 'failed', err);
-              callback && callback(null, self.db);
-            });
-        } else {
-          process.nextTick(function () {
-            callback && callback(null, self.db);
-          });
-        }
       }
     });
+    if (self.settings.mappingProperties) {
+      self.setupMappings()
+        .then(function () {
+          log('ESConnector.prototype.connect', 'setupMappings', 'finished');
+          callback && callback(null, self.db);
+        })
+        .catch(function (err) {
+          log('ESConnector.prototype.connect', 'setupMappings', 'failed', err);
+          callback && callback(null, self.db);
+        });
+    } else {
+      process.nextTick(function () {
+        callback && callback(null, self.db);
+      });
+    }
   }
 };