diff --git a/lib/modules/ens/index.js b/lib/modules/ens/index.js
index c51a86ac..3ac8443b 100644
--- a/lib/modules/ens/index.js
+++ b/lib/modules/ens/index.js
@@ -14,6 +14,13 @@ class ENS {
     this.registration = this.namesConfig.register || {};
     this.embark = embark;
 
+    if (this.namesConfig === {} ||
+      this.namesConfig.enabled !== true ||
+      this.namesConfig.available_providers.indexOf('ens') < 0 ||
+      this.namesConfig.provider !== 'ens') {
+      return;
+    }
+
     this.addENSToEmbarkJS();
     this.configureContracts();
     this.registerEvents();
@@ -179,14 +186,6 @@ class ENS {
 
   addENSToEmbarkJS() {
     const self = this;
-    // TODO: make this a shouldAdd condition
-    if (this.namesConfig === {}) {
-      return;
-    }
-
-    if ((this.namesConfig.available_providers.indexOf('ens') < 0) && (this.namesConfig.provider !== 'ens' || this.namesConfig.enabled !== true)) {
-      return;
-    }
 
     // get namehash, import it into file
     self.events.request("version:get:eth-ens-namehash", function (EnsNamehashVersion) {