diff --git a/packages/shared/store/SettingsStore.ts b/packages/shared/store/SettingsStore.ts
index 0c5d2fd6cb..7eba4b7be4 100644
--- a/packages/shared/store/SettingsStore.ts
+++ b/packages/shared/store/SettingsStore.ts
@@ -874,22 +874,11 @@ class SettingsStore {
     this.publicRoomKey = key;
   };
 
-  socketFilesClient: SocketIOHelper | null = null;
-
   get socketHelper() {
-    const socketUrl = isPublicRoom() && !this.publicRoomKey ? "" : "/socket.io"; // this.socketUrl;
+    const socketUrl =
+      isPublicRoom() && !this.publicRoomKey ? "" : this.socketUrl;
 
-    if (!this.socketFilesClient) {
-      this.socketFilesClient = new SocketIOHelper(
-        socketUrl,
-        this.publicRoomKey,
-      );
-
-      // TODO: comment this line
-      window.socketFilesClient = this.socketFilesClient;
-    }
-
-    return this.socketFilesClient;
+    return new SocketIOHelper(socketUrl, this.publicRoomKey);
   }
 
   getBuildVersionInfo = async () => {
diff --git a/packages/shared/utils/socket.ts b/packages/shared/utils/socket.ts
index cf3510ee03..9598ef14e6 100644
--- a/packages/shared/utils/socket.ts
+++ b/packages/shared/utils/socket.ts
@@ -116,6 +116,9 @@ class SocketIOHelper {
       console.log("socket connect error", err),
     );
     this.client.on("disconnect", () => console.log("socket is disconnected"));
+
+    // DEV tests
+    // window.socketHelper = this;
   }
 
   get isEnabled() {