diff --git a/frontend/src/pages/app/ui/components/chat/MessagePanelRenderer.tsx b/frontend/src/pages/app/ui/components/chat/MessagePanelRenderer.tsx
index 97ddc6e..4bd3607 100644
--- a/frontend/src/pages/app/ui/components/chat/MessagePanelRenderer.tsx
+++ b/frontend/src/pages/app/ui/components/chat/MessagePanelRenderer.tsx
@@ -4,7 +4,7 @@ import { MessagePanel, type MessagePanelState } from "../../panels/MessagePanel"
 import { ChatMessages } from "./ChatMessages";
 import { ChatInputWrapper } from "./ChatInputWrapper";
 import { setGlobalMessageHandler } from "../../../core/websocket";
-import type { Message } from "../../../core/types";
+import type { Message, WebSocketMessage } from "../../../core/types";
 import defaultAvatar from "../../../resources/images/default-avatar.png";
 import AnimatedOpacity from "../core/animations/AnimatedOpacity";
 import type { DMPanel } from "../../panels/DMPanel";
@@ -65,7 +65,7 @@ export function MessagePanelRenderer({ panel }: MessagePanelRendererProps) {
             
             // Set up WebSocket message handler for this panel
             if (panel.handleWebSocketMessage) {
-                setGlobalMessageHandler(panel.handleWebSocketMessage);
+                setGlobalMessageHandler((message: WebSocketMessage<any>) => panel.handleWebSocketMessage(message));
             }
         } else {
             setPanelState(null);
diff --git a/frontend/src/pages/app/ui/hooks/useDM.ts b/frontend/src/pages/app/ui/hooks/useDM.ts
index 67bd2fe..9e55858 100644
--- a/frontend/src/pages/app/ui/hooks/useDM.ts
+++ b/frontend/src/pages/app/ui/hooks/useDM.ts
@@ -198,7 +198,7 @@ export function useDM() {
 
     // WebSocket message handler
     useEffect(() => {
-        const handleWebSocketMessage = async (e: MessageEvent) => {
+        async function handleWebSocketMessage(e: MessageEvent) {
             try {
                 const msg = JSON.parse(e.data);
                 if (msg.type === "dmNew") {
@@ -258,9 +258,10 @@ export function useDM() {
             } catch (error) {
                 console.error("Failed to handle WebSocket message:", error);
             }
-        };
+        }
 
         websocket.addEventListener("message", handleWebSocketMessage);
+
         return () => websocket.removeEventListener("message", handleWebSocketMessage);
     }, [chat.activeDm, user.currentUser, addMessage]);