diff --git a/server/src/socket-connection/connection.ts b/server/src/socket-connection/connection.ts
index a7f7565d..057e0fe8 100644
--- a/server/src/socket-connection/connection.ts
+++ b/server/src/socket-connection/connection.ts
@@ -1,98 +1,7 @@
 import { Namespace, Socket } from 'socket.io';
-import { IncomingMessage } from 'http';
-import { verify, JwtPayload } from 'jsonwebtoken';
 import logger from "../logger";
 import registerInputHandlers from '../browser-management/inputHandlers';
 
-interface AuthenticatedIncomingMessage extends IncomingMessage {
-  user?: JwtPayload | string;
-}
-
-interface AuthenticatedSocket extends Socket {
-  request: AuthenticatedIncomingMessage;
-}
-
-declare global {
-  var userContextMap: Map<string, string>;
-}
-
-if (!global.userContextMap) {
-  global.userContextMap = new Map<string, string>();
-}
-
-/**
- * Register browser-user association in the global context map
- */
-export function registerBrowserUserContext(browserId: string, userId: string) {
-  if (!global.userContextMap) {
-    global.userContextMap = new Map<string, string>();
-  }
-  global.userContextMap.set(browserId, userId);
-  logger.log('debug', `Registered browser-user association: ${browserId} -> ${userId}`);
-}
-
-/**
- * Socket.io middleware for authentication
- * This is a socket.io specific auth handler that doesn't rely on Express middleware
- */
-const socketAuthMiddleware = (socket: Socket, next: (err?: Error) => void) => {
-  // Extract browserId from namespace
-  const namespace = socket.nsp.name;
-  const browserId = namespace.slice(1); 
-  
-  // Check if this browser is in our context map
-  if (global.userContextMap && global.userContextMap.has(browserId)) {
-    const userId = global.userContextMap.get(browserId);
-    logger.log('debug', `Found browser in context map: ${browserId} -> ${userId}`);
-    
-    const authSocket = socket as AuthenticatedSocket;
-    authSocket.request.user = { id: userId };
-    return next(); 
-  }
-  
-  const cookies = socket.handshake.headers.cookie;
-  if (!cookies) {
-    logger.log('debug', `No cookies found in socket handshake for ${browserId}`);
-    return next(new Error('Authentication required'));
-  }
-  
-  const tokenMatch = cookies.split(';').find(c => c.trim().startsWith('token='));
-  if (!tokenMatch) {
-    logger.log('debug', `No token cookie found in socket handshake for ${browserId}`);
-    return next(new Error('Authentication required'));
-  }
-  
-  const token = tokenMatch.split('=')[1];
-  if (!token) {
-    logger.log('debug', `Empty token value in cookie for ${browserId}`);
-    return next(new Error('Authentication required'));
-  }
-  
-  const secret = process.env.JWT_SECRET;
-  if (!secret) {
-    logger.error('JWT_SECRET environment variable is not defined');
-    return next(new Error('Server configuration error'));
-  }
-  
-  verify(token, secret, (err: any, user: any) => {
-    if (err) {
-      logger.log('warn', `JWT verification error: ${err.message}`);
-      return next(new Error('Authentication failed'));
-    }
-    
-    // Normalize payload key
-    if (user.userId && !user.id) {
-      user.id = user.userId;
-      delete user.userId;
-    }
-    
-    // Attach user to socket request
-    const authSocket = socket as AuthenticatedSocket;
-    authSocket.request.user = user;
-    next();
-  });
-};
-
 /**
  * Opens a websocket canal for duplex data transfer and registers all handlers for this data for the recording session.
  * Uses socket.io dynamic namespaces for multiplexing the traffic from different running remote browser instances.
@@ -104,8 +13,6 @@ export const createSocketConnection = (
     io: Namespace,
     callback: (socket: Socket) => void,
 ) => {
-    io.use(socketAuthMiddleware);
-
     const onConnection = async (socket: Socket) => {
         logger.log('info', "Client connected " + socket.id);
         registerInputHandlers(socket);
@@ -127,8 +34,6 @@ export const createSocketConnectionForRun = (
     io: Namespace,
     callback: (socket: Socket) => void,
 ) => {
-    io.use(socketAuthMiddleware);
-
     const onConnection = async (socket: Socket) => {
         logger.log('info', "Client connected " + socket.id);
         socket.on('disconnect', () => logger.log('info', "Client disconnected " + socket.id));