diff --git a/frontend/app/components/Kai/SocketManager.ts b/frontend/app/components/Kai/SocketManager.ts
index b57fd1a84..da2537ee5 100644
--- a/frontend/app/components/Kai/SocketManager.ts
+++ b/frontend/app/components/Kai/SocketManager.ts
@@ -6,6 +6,7 @@ export class ChatManager {
 
   constructor({ projectId, userId, threadId }: { projectId: string; userId: string; threadId: string }) {
     this.threadId = threadId;
+    console.log('Kai socket', projectId, userId, threadId, window.env.KAI_TESTING);
     const socket = io(`localhost:8700/kai/chat`, {
       transports: ['websocket'],
       autoConnect: true,
@@ -27,6 +28,9 @@ export class ChatManager {
     socket.on('disconnect', () => {
       console.log('Disconnected from server');
     });
+    socket.on('error', (err) => {
+      console.error('Socket error:', err);
+    })
     socket.onAny((e) => console.log('event', e));
 
     this.socket = socket;
diff --git a/frontend/app/components/Kai/components/ChatLog.tsx b/frontend/app/components/Kai/components/ChatLog.tsx
index 415cd429b..909557909 100644
--- a/frontend/app/components/Kai/components/ChatLog.tsx
+++ b/frontend/app/components/Kai/components/ChatLog.tsx
@@ -35,11 +35,10 @@ function ChatLog({
   const [isLoading, setLoading] = React.useState(false);
 
   React.useEffect(() => {
-    console.log(threadId, initialMsg);
+    //const settings = { projectId: projectId ?? 2325, userId: userId ?? 65 };
+    const settings = { projectId: '2325', userId: '0', threadId, };
     if (threadId && !initialMsg) {
       setLoading(true);
-      //const settings = { projectId: projectId ?? 2325, userId: userId ?? 65 };
-      const settings = { projectId: '2325', userId: '0' };
       aiService
         .getKaiChat(settings.projectId, settings.userId, threadId)
         .then((res) => {
@@ -62,6 +61,8 @@ function ChatLog({
         .finally(() => {
           setLoading(false);
         });
+    }
+    if (threadId) {
       chatManager.current = new ChatManager(settings);
       chatManager.current.setOnMsgHook({
         msgCallback: (msg) => {