diff --git a/ui/desktop/src/components/pair.tsx b/ui/desktop/src/components/pair.tsx
index 982240f18a..5a18138bd0 100644
--- a/ui/desktop/src/components/pair.tsx
+++ b/ui/desktop/src/components/pair.tsx
@@ -326,7 +326,7 @@ export default function Pair({
       unsubscribeMessage();
       unsubscribeGooseMessage();
     };
-  }, [isMatrixMode, matrixRoomId, onMessage, onGooseMessage, setChat]);
+  }, [isMatrixMode, matrixRoomId, onMessage, onGooseMessage]); // Removed setChat from dependencies to prevent constant re-renders
 
   const { initialPrompt: recipeInitialPrompt } = useRecipeManager(chat, chat.recipeConfig || null);