diff --git a/frontend/src/pages/AssistantChatPage.tsx b/frontend/src/pages/AssistantChatPage.tsx
index 3dcd4c27..45ce031b 100644
--- a/frontend/src/pages/AssistantChatPage.tsx
+++ b/frontend/src/pages/AssistantChatPage.tsx
@@ -48,21 +48,21 @@ export default function AssistantChatPage() {
   const [activeQuestions, setActiveQuestions] = useState<QuestionItem[]>(() => {
     try {
       const saved = sessionStorage.getItem('rf-tasklane-meta')
-      if (saved) { const d = JSON.parse(saved); return d.questions || [] }
+      if (saved) { const d = JSON.parse(saved); if (d.chatId === activeChatId) return d.questions || [] }
     } catch { /* ignore */ }
     return []
   })
   const [activeActions, setActiveActions] = useState<ActionItem[]>(() => {
     try {
       const saved = sessionStorage.getItem('rf-tasklane-meta')
-      if (saved) { const d = JSON.parse(saved); return d.actions || [] }
+      if (saved) { const d = JSON.parse(saved); if (d.chatId === activeChatId) return d.actions || [] }
     } catch { /* ignore */ }
     return []
   })
   const [showTaskLane, setShowTaskLane] = useState(() => {
     try {
       const saved = sessionStorage.getItem('rf-tasklane-meta')
-      if (saved) { const d = JSON.parse(saved); return d.show === true && d.chatId === (urlSessionId || null) }
+      if (saved) { const d = JSON.parse(saved); return d.show === true && d.chatId === activeChatId }
     } catch { /* ignore */ }
     return false
   })