diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js
index 4d52897a6..df7ac4aec 100644
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -129,6 +129,7 @@ module.exports = {
       },
       rules: {
         "@typescript-eslint/prefer-optional-chain": "error",
+        "react-hooks/exhaustive-deps": "off",
         "no-shadow": "off",
         "@typescript-eslint/no-shadow": "error",
         "@typescript-eslint/prefer-nullish-coalescing": "error",
diff --git a/frontend/app/chat/[chatId]/components/DataPanel/components/RelatedBrains/RelatedBrains.tsx b/frontend/app/chat/[chatId]/components/DataPanel/components/RelatedBrains/RelatedBrains.tsx
index 4d380f9ac..1e2574721 100644
--- a/frontend/app/chat/[chatId]/components/DataPanel/components/RelatedBrains/RelatedBrains.tsx
+++ b/frontend/app/chat/[chatId]/components/DataPanel/components/RelatedBrains/RelatedBrains.tsx
@@ -32,12 +32,12 @@ const RelatedBrains = ({ closeBrains }: RelatedBrainsProps): JSX.Element => {
       const g = Math.round(lerp(211, 43, t));
       const b = Math.round(lerp(211, 226, t));
       const isCurrentBrain =
-        brain.name === messages[messages.length - 1].brain_name;
+        brain.id === messages[messages.length - 1].brain_id;
 
       return { color: `rgb(${r}, ${g}, ${b})`, isCurrentBrain: isCurrentBrain };
     });
     setCloseBrainProps(newProps);
-  }, [closeBrains, messages]);
+  }, [closeBrains, messages.length]);
 
   if (closeBrains.length === 0) {
     return <></>;
diff --git a/frontend/app/chat/[chatId]/page.module.scss b/frontend/app/chat/[chatId]/page.module.scss
index 7a0024595..0dea74793 100644
--- a/frontend/app/chat/[chatId]/page.module.scss
+++ b/frontend/app/chat/[chatId]/page.module.scss
@@ -5,7 +5,8 @@
   display: flex;
   flex: 1 1 0%;
   background-color: Colors.$white;
-  padding: Spacings.$spacing06;
+  padding-block: Spacings.$spacing06;
+  padding-inline: Spacings.$spacing09;
   display: flex;
   gap: Spacings.$spacing09;
 
diff --git a/frontend/app/chat/[chatId]/types/index.ts b/frontend/app/chat/[chatId]/types/index.ts
index d6dad3b85..7652bef72 100644
--- a/frontend/app/chat/[chatId]/types/index.ts
+++ b/frontend/app/chat/[chatId]/types/index.ts
@@ -18,6 +18,7 @@ export type ChatMessage = {
   message_time: string;
   prompt_title?: string;
   brain_name?: string;
+  brain_id?: UUID;
   metadata?: {
     sources?: [string];
     close_brains?: CloseBrain[];