diff --git a/lib/modules/ens/index.js b/lib/modules/ens/index.js
index 2f94092e7..472ea3168 100644
--- a/lib/modules/ens/index.js
+++ b/lib/modules/ens/index.js
@@ -18,9 +18,8 @@ class ENS {
       this.namesConfig.enabled !== true ||
       this.namesConfig.available_providers.indexOf('ens') < 0) {
       return;
-    } else if (this.namesConfig.provider !== 'ens') {
-      this.providerNotENS = true;
     }
+    this.doSetENSProvider = this.namesConfig.provider === 'ens';
 
     this.addENSToEmbarkJS();
     this.configureContracts();
@@ -63,7 +62,10 @@ class ENS {
         resolverAbi: results[2].abiDefinition,
         resolverAddress: results[2].deployedAddress
       };
-      self.addSetProvider(config);
+
+      if (self.doSetENSProvider) {
+        self.addSetProvider(config);
+      }
 
       if (!self.env === 'development' || !self.registration || !self.registration.subdomains || !Object.keys(self.registration.subdomains).length) {
         return cb();
@@ -187,9 +189,6 @@ class ENS {
 
   addENSToEmbarkJS() {
     const self = this;
-    if (self.providerNotENS) {
-      return;
-    }
 
     // get namehash, import it into file
     self.events.request("version:get:eth-ens-namehash", function (EnsNamehashVersion) {