diff --git a/src/contexts/WebSocketContextNew.tsx b/src/contexts/WebSocketContextNew.tsx
index 2ef04abf..5f2fadb5 100755
--- a/src/contexts/WebSocketContextNew.tsx
+++ b/src/contexts/WebSocketContextNew.tsx
@@ -35,10 +35,16 @@ export function WebSocketProvider({ children }: WebSocketProviderProps) {
       initSocket(getAccessToken);
       socketInitialized = true;
     }
-    
-    console.log('🔧 [GPT-5 Context] Connecting socket');
-    connectSocket();
-    
+
+    // Only connect if we have a valid token
+    const currentToken = getAccessToken();
+    if (currentToken) {
+      console.log('🔧 [GPT-5 Context] Connecting socket with token');
+      connectSocket();
+    } else {
+      console.log('🔧 [GPT-5 Context] No token available, skipping WebSocket connection');
+    }
+
     return () => {
       // DO NOT removeAllListeners() here; we want to preserve core listeners.
       // If you must clean up, be explicit with off(event, handlerRef).