diff --git a/ee/assist/servers/websocket.js b/ee/assist/servers/websocket.js
index 6404792bb..51b715b27 100644
--- a/ee/assist/servers/websocket.js
+++ b/ee/assist/servers/websocket.js
@@ -39,7 +39,8 @@ const createSocketIOServer = function (server, prefix) {
                 methods: ["GET", "POST", "PUT"]
             },
             path: (prefix ? prefix : '') + '/socket',
-            perMessageDeflate: getCompressionConfig()
+            perMessageDeflate: getCompressionConfig(),
+            clientNoContextTakeover: process.env.CLIENT_CONTEXT_TAKEOVER && process.env.CLIENT_CONTEXT_TAKEOVER === "true"
         });
     } else {
         io = new _io.Server({