diff --git a/ee/utilities/servers/websocket-cluster.js b/ee/utilities/servers/websocket-cluster.js
index 4f310468a..bc68be6aa 100644
--- a/ee/utilities/servers/websocket-cluster.js
+++ b/ee/utilities/servers/websocket-cluster.js
@@ -283,6 +283,7 @@ module.exports = {
     start: (server, prefix) => {
         createSocketIOServer(server, prefix);
         io.on('connection', async (socket) => {
+            socket.on(EVENTS_DEFINITION.listen.ERROR, err => errorHandler(EVENTS_DEFINITION.listen.ERROR, err));
             debug && console.log(`WS started:${socket.id}, Query:${JSON.stringify(socket.handshake.query)}`);
             socket._connectedAt = new Date();
             socket.peerId = socket.handshake.query.peerId;
@@ -351,7 +352,6 @@ module.exports = {
 
             socket.on(EVENTS_DEFINITION.listen.CONNECT_ERROR, err => errorHandler(EVENTS_DEFINITION.listen.CONNECT_ERROR, err));
             socket.on(EVENTS_DEFINITION.listen.CONNECT_FAILED, err => errorHandler(EVENTS_DEFINITION.listen.CONNECT_FAILED, err));
-            socket.on(EVENTS_DEFINITION.listen.ERROR, err => errorHandler(EVENTS_DEFINITION.listen.ERROR, err));
 
             socket.onAny(async (eventName, ...args) => {
                 if (Object.values(EVENTS_DEFINITION.listen).indexOf(eventName) >= 0) {
diff --git a/ee/utilities/servers/websocket.js b/ee/utilities/servers/websocket.js
index 224f44490..11685ee78 100644
--- a/ee/utilities/servers/websocket.js
+++ b/ee/utilities/servers/websocket.js
@@ -261,6 +261,7 @@ module.exports = {
     start: (server, prefix) => {
         createSocketIOServer(server, prefix);
         io.on('connection', async (socket) => {
+            socket.on(EVENTS_DEFINITION.listen.ERROR, err => errorHandler(EVENTS_DEFINITION.listen.ERROR, err));
             debug && console.log(`WS started:${socket.id}, Query:${JSON.stringify(socket.handshake.query)}`);
             socket._connectedAt = new Date();
             socket.peerId = socket.handshake.query.peerId;
@@ -327,7 +328,6 @@ module.exports = {
 
             socket.on(EVENTS_DEFINITION.listen.CONNECT_ERROR, err => errorHandler(EVENTS_DEFINITION.listen.CONNECT_ERROR, err));
             socket.on(EVENTS_DEFINITION.listen.CONNECT_FAILED, err => errorHandler(EVENTS_DEFINITION.listen.CONNECT_FAILED, err));
-            socket.on(EVENTS_DEFINITION.listen.ERROR, err => errorHandler(EVENTS_DEFINITION.listen.ERROR, err));
 
             socket.onAny(async (eventName, ...args) => {
                 if (Object.values(EVENTS_DEFINITION.listen).indexOf(eventName) >= 0) {
diff --git a/sourcemap-reader/server.js b/sourcemap-reader/server.js
index c67e50428..327994042 100644
--- a/sourcemap-reader/server.js
+++ b/sourcemap-reader/server.js
@@ -3,8 +3,8 @@ const sourcemapsReaderServer = require('./servers/sourcemaps-server');
 const express = require('express');
 const {request_logger} = require("./utils/helper");
 
-const HOST = process.env.MAIN_HOST || '127.0.0.1';
-const PORT = process.env.MAIN_PORT || 9000;
+const HOST = process.env.SR_HOST || '127.0.0.1';
+const PORT = process.env.SR_PORT || 9000;
 
 const app = express();
 app.use(request_logger("[SR]"));
diff --git a/utilities/servers/websocket.js b/utilities/servers/websocket.js
index 70c472e67..351ce5be2 100644
--- a/utilities/servers/websocket.js
+++ b/utilities/servers/websocket.js
@@ -242,6 +242,7 @@ module.exports = {
     start: (server, prefix) => {
         createSocketIOServer(server, prefix);
         io.on('connection', async (socket) => {
+            socket.on(EVENTS_DEFINITION.listen.ERROR, err => errorHandler(EVENTS_DEFINITION.listen.ERROR, err));
             debug && console.log(`WS started:${socket.id}, Query:${JSON.stringify(socket.handshake.query)}`);
             socket._connectedAt = new Date();
             socket.peerId = socket.handshake.query.peerId;
@@ -308,7 +309,6 @@ module.exports = {
 
             socket.on(EVENTS_DEFINITION.listen.CONNECT_ERROR, err => errorHandler(EVENTS_DEFINITION.listen.CONNECT_ERROR, err));
             socket.on(EVENTS_DEFINITION.listen.CONNECT_FAILED, err => errorHandler(EVENTS_DEFINITION.listen.CONNECT_FAILED, err));
-            socket.on(EVENTS_DEFINITION.listen.ERROR, err => errorHandler(EVENTS_DEFINITION.listen.ERROR, err));
 
             socket.onAny(async (eventName, ...args) => {
                 if (Object.values(EVENTS_DEFINITION.listen).indexOf(eventName) >= 0) {