diff --git a/packages/web-client/src/features/chat/presentation/hooks/useChat.ts b/packages/web-client/src/features/chat/presentation/hooks/useChat.ts
index b21d14d..10e9cdd 100644
--- a/packages/web-client/src/features/chat/presentation/hooks/useChat.ts
+++ b/packages/web-client/src/features/chat/presentation/hooks/useChat.ts
@@ -27,15 +27,19 @@ export function useChat() {
     });
 
     socket.on('connect', () => {
-      console.log('WebSocket connected');
+      console.log('WebSocket connected, socket id:', socket.id);
       setConnected(true);
     });
 
-    socket.on('disconnect', () => {
-      console.log('WebSocket disconnected');
+    socket.on('disconnect', (reason) => {
+      console.log('WebSocket disconnected, reason:', reason);
       setConnected(false);
     });
 
+    socket.on('connect_error', (error) => {
+      console.error('WebSocket connect_error:', error.message);
+    });
+
     socket.on('connected', (data) => {
       console.log('Connection confirmed:', data);
     });
@@ -111,10 +115,15 @@ export function useChat() {
       addMessage(conversationId, userMessage);
 
       // Send via WebSocket
-      socketRef.current?.emit('message', {
-        conversationId,
-        content: content.trim(),
-      });
+      if (socketRef.current?.connected) {
+        console.log('Sending message via WebSocket:', { conversationId, content: content.trim() });
+        socketRef.current.emit('message', {
+          conversationId,
+          content: content.trim(),
+        });
+      } else {
+        console.error('WebSocket not connected, cannot send message');
+      }
     },
     [userId, currentConversationId, addMessage],
   );