diff --git a/apps/client/src/network/handlers/LobbyHandler.ts b/apps/client/src/network/handlers/LobbyHandler.ts
index b315f6c..0a7cad1 100644
--- a/apps/client/src/network/handlers/LobbyHandler.ts
+++ b/apps/client/src/network/handlers/LobbyHandler.ts
@@ -1,23 +1,50 @@
 import type { Socket } from "socket.io-client";
 import { protocol } from "@repo/shared";
-import type { roomTypes } from "@repo/shared";
+import type { PayloadOf, SocketPayloadMap } from "@repo/shared";
+
+type SocketEventName = Exclude<keyof SocketPayloadMap, "connect" | "disconnect">;
 
 type LobbyHandler = {
-  onRoomUpdate: (callback: (room: roomTypes.Room) => void) => void;
-  offRoomUpdate: (callback: (room: roomTypes.Room) => void) => void;
+  onRoomUpdate: (callback: (room: PayloadOf<typeof protocol.SocketEvents.ROOM_UPDATE>) => void) => void;
+  offRoomUpdate: (callback: (room: PayloadOf<typeof protocol.SocketEvents.ROOM_UPDATE>) => void) => void;
   startGame: () => void;
 };
 
 export const createLobbyHandler = (socket: Socket): LobbyHandler => {
+  const onEvent = <TEvent extends SocketEventName>(
+    event: TEvent,
+    callback: (payload: PayloadOf<TEvent>) => void
+  ) => {
+    (socket as any).on(event, callback);
+  };
+
+  const offEvent = <TEvent extends SocketEventName>(
+    event: TEvent,
+    callback: (payload: PayloadOf<TEvent>) => void
+  ) => {
+    (socket as any).off(event, callback);
+  };
+
+  function emitEvent<TEvent extends SocketEventName>(event: TEvent): void;
+  function emitEvent<TEvent extends SocketEventName>(event: TEvent, payload: PayloadOf<TEvent>): void;
+  function emitEvent<TEvent extends SocketEventName>(event: TEvent, payload?: PayloadOf<TEvent>): void {
+    if (payload === undefined) {
+      (socket as any).emit(event);
+      return;
+    }
+
+    (socket as any).emit(event, payload);
+  }
+
   return {
-    onRoomUpdate: (callback: (room: roomTypes.Room) => void) => {
-      socket.on(protocol.SocketEvents.ROOM_UPDATE, callback);
+    onRoomUpdate: (callback) => {
+      onEvent(protocol.SocketEvents.ROOM_UPDATE, callback);
     },
-    offRoomUpdate: (callback: (room: roomTypes.Room) => void) => {
-      socket.off(protocol.SocketEvents.ROOM_UPDATE, callback);
+    offRoomUpdate: (callback) => {
+      offEvent(protocol.SocketEvents.ROOM_UPDATE, callback);
     },
     startGame: () => {
-      socket.emit(protocol.SocketEvents.START_GAME);
+      emitEvent(protocol.SocketEvents.START_GAME);
     }
   };
 };
diff --git a/apps/client/src/network/handlers/TitleHandler.ts b/apps/client/src/network/handlers/TitleHandler.ts
index 3246817..d91da27 100644
--- a/apps/client/src/network/handlers/TitleHandler.ts
+++ b/apps/client/src/network/handlers/TitleHandler.ts
@@ -1,23 +1,50 @@
 import type { Socket } from "socket.io-client";
 import { protocol } from "@repo/shared";
-import type { roomTypes } from "@repo/shared";
+import type { PayloadOf, SocketPayloadMap } from "@repo/shared";
+
+type SocketEventName = Exclude<keyof SocketPayloadMap, "connect" | "disconnect">;
 
 type TitleHandler = {
-  joinRoom: (payload: roomTypes.JoinRoomPayload) => void;
-  onJoinRejected: (callback: (payload: roomTypes.JoinRoomRejectedPayload) => void) => void;
-  offJoinRejected: (callback: (payload: roomTypes.JoinRoomRejectedPayload) => void) => void;
+  joinRoom: (payload: PayloadOf<typeof protocol.SocketEvents.JOIN_ROOM>) => void;
+  onJoinRejected: (callback: (payload: PayloadOf<typeof protocol.SocketEvents.ROOM_JOIN_REJECTED>) => void) => void;
+  offJoinRejected: (callback: (payload: PayloadOf<typeof protocol.SocketEvents.ROOM_JOIN_REJECTED>) => void) => void;
 };
 
 export const createTitleHandler = (socket: Socket): TitleHandler => {
+  const onEvent = <TEvent extends SocketEventName>(
+    event: TEvent,
+    callback: (payload: PayloadOf<TEvent>) => void
+  ) => {
+    (socket as any).on(event, callback);
+  };
+
+  const offEvent = <TEvent extends SocketEventName>(
+    event: TEvent,
+    callback: (payload: PayloadOf<TEvent>) => void
+  ) => {
+    (socket as any).off(event, callback);
+  };
+
+  function emitEvent<TEvent extends SocketEventName>(event: TEvent): void;
+  function emitEvent<TEvent extends SocketEventName>(event: TEvent, payload: PayloadOf<TEvent>): void;
+  function emitEvent<TEvent extends SocketEventName>(event: TEvent, payload?: PayloadOf<TEvent>): void {
+    if (payload === undefined) {
+      (socket as any).emit(event);
+      return;
+    }
+
+    (socket as any).emit(event, payload);
+  }
+
   return {
-    joinRoom: (payload: roomTypes.JoinRoomPayload) => {
-      socket.emit(protocol.SocketEvents.JOIN_ROOM, payload);
+    joinRoom: (payload) => {
+      emitEvent(protocol.SocketEvents.JOIN_ROOM, payload);
     },
-    onJoinRejected: (callback: (payload: roomTypes.JoinRoomRejectedPayload) => void) => {
-      socket.on(protocol.SocketEvents.ROOM_JOIN_REJECTED, callback);
+    onJoinRejected: (callback) => {
+      onEvent(protocol.SocketEvents.ROOM_JOIN_REJECTED, callback);
     },
-    offJoinRejected: (callback: (payload: roomTypes.JoinRoomRejectedPayload) => void) => {
-      socket.off(protocol.SocketEvents.ROOM_JOIN_REJECTED, callback);
+    offJoinRejected: (callback) => {
+      offEvent(protocol.SocketEvents.ROOM_JOIN_REJECTED, callback);
     }
   };
 };