diff --git a/packages/plugins/geth/src/gethClient.js b/packages/plugins/geth/src/gethClient.js
index 6c4f94f4d..57f01e307 100644
--- a/packages/plugins/geth/src/gethClient.js
+++ b/packages/plugins/geth/src/gethClient.js
@@ -13,8 +13,8 @@ const DEFAULTS = {
   "NETWORK_TYPE": "custom",
   "NETWORK_ID": 1337,
   "RPC_API": ['eth', 'web3', 'net', 'debug', 'personal'],
-  "WS_API": ['eth', 'web3', 'net', 'shh', 'debug', 'pubsub', 'personal'],
-  "DEV_WS_API": ['eth', 'web3', 'net', 'shh', 'debug', 'pubsub', 'personal'],
+  "WS_API": ['eth', 'web3', 'net', 'debug', 'pubsub', 'personal'],
+  "DEV_WS_API": ['eth', 'web3', 'net', 'debug', 'pubsub', 'personal'],
   "TARGET_GAS_LIMIT": 8000000
 };
 
@@ -325,17 +325,6 @@ class GethClient {
         }
         callback("");
       },
-      function whisper(callback) {
-        if (config.whisper) {
-          rpc_api.push('shh');
-          if (ws_api.indexOf('shh') === -1) {
-            ws_api.push('shh');
-          }
-          args.push("--shh");
-          return callback(null, "--shh ");
-        }
-        callback("");
-      },
       function rpcApi(callback) {
         args.push('--rpcapi=' + rpc_api.join(','));
         callback(null, '--rpcapi=' + rpc_api.join(','));
diff --git a/packages/plugins/geth/src/whisperClient.js b/packages/plugins/geth/src/whisperClient.js
index 8a2ac775c..8cb8e9df7 100644
--- a/packages/plugins/geth/src/whisperClient.js
+++ b/packages/plugins/geth/src/whisperClient.js
@@ -9,9 +9,9 @@ const DEFAULTS = {
   "VERSIONS_SUPPORTED": ">=1.9.7",
   "NETWORK_TYPE": "custom",
   "NETWORK_ID": 1337,
-  "RPC_API": ['eth', 'web3', 'net', 'debug', 'personal'],
-  "WS_API": ['eth', 'web3', 'net', 'shh', 'debug', 'pubsub', 'personal'],
-  "DEV_WS_API": ['eth', 'web3', 'net', 'shh', 'debug', 'pubsub', 'personal'],
+  "RPC_API": ['web3'],
+  "WS_API": ['web3', 'shh'],
+  "DEV_WS_API": ['web3', 'shh'],
   "TARGET_GAS_LIMIT": 8000000
 };