diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js
index c028540bc..2032ba2c1 100644
--- a/platform/chromium/vapi-background.js
+++ b/platform/chromium/vapi-background.js
@@ -1097,6 +1097,18 @@ vAPI.net.registerListeners = function() {
     if ( onBeforeRequest ) {
         urls = this.onBeforeRequest.urls || ['<all_urls>'];
         types = this.onBeforeRequest.types || undefined;
+        if (
+            (validTypes.websocket) &&
+            (types === undefined || types.indexOf('websocket') !== -1) &&
+            (urls.indexOf('<all_urls>') === -1)
+        ) {
+            if ( urls.indexOf('ws://*/*') === -1 ) {
+                urls.push('ws://*/*');
+            }
+            if ( urls.indexOf('wss://*/*') === -1 ) {
+                urls.push('wss://*/*');
+            }
+        }
         wrApi.onBeforeRequest.addListener(
             onBeforeRequest,
             { urls: urls, types: types },
diff --git a/src/js/traffic.js b/src/js/traffic.js
index 0f570429b..da56f1a0f 100644
--- a/src/js/traffic.js
+++ b/src/js/traffic.js
@@ -679,9 +679,7 @@ var headerIndexFromName = function(headerName, headers) {
 vAPI.net.onBeforeRequest = {
     urls: [
         'http://*/*',
-        'https://*/*',
-        'ws://*/*',
-        'wss://*/*'
+        'https://*/*'
     ],
     extra: [ 'blocking' ],
     callback: onBeforeRequest