diff --git a/app/components/chat.tsx b/app/components/chat.tsx
index ed51d926f4e..5669cc9a314 100644
--- a/app/components/chat.tsx
+++ b/app/components/chat.tsx
@@ -2071,6 +2071,6 @@ function _Chat() {
 
 export function Chat() {
   const chatStore = useChatStore();
-  const sessionIndex = chatStore.currentSessionIndex;
-  return <_Chat key={sessionIndex}></_Chat>;
+  const session = chatStore.currentSession();
+  return <_Chat key={session.id}></_Chat>;
 }