diff --git a/lib/core/engine.js b/lib/core/engine.js
index 5d133601a..9b16e829d 100644
--- a/lib/core/engine.js
+++ b/lib/core/engine.js
@@ -281,11 +281,11 @@ class Engine {
       web3: options.web3
     });
 
-    this.web3 = this.blockchain.web3;
-
     this.registerModule('whisper', {
       addCheck: this.servicesMonitor.addCheck.bind(this.servicesMonitor),
       communicationConfig: this.config.communicationConfig,
+      // TODO: this should not be needed and should be deducted from the config instead
+      // the eth provider is not necessary the same as the whisper one
       web3: this.web3
     });
   }
diff --git a/lib/modules/whisper/index.js b/lib/modules/whisper/index.js
index 4546dd24a..624fb63e5 100644
--- a/lib/modules/whisper/index.js
+++ b/lib/modules/whisper/index.js
@@ -8,6 +8,7 @@ class Whisper {
     this.events = embark.events;
     this.communicationConfig = options.communicationConfig;
     this.addCheck = options.addCheck;
+    // TODO: this should not be needed and should be deducted from the config instead
     this.web3 = options.web3;
     this.embark = embark;