diff --git a/frontend/src/pages/AssistantChatPage.tsx b/frontend/src/pages/AssistantChatPage.tsx
index 2b0892d7..6246ab0b 100644
--- a/frontend/src/pages/AssistantChatPage.tsx
+++ b/frontend/src/pages/AssistantChatPage.tsx
@@ -247,7 +247,10 @@ export default function AssistantChatPage() {
       setActivePsaTicketId(detail.psa_ticket_id)
       if (detail.psa_ticket_id) {
         integrationsApi.getTicket(detail.psa_ticket_id)
-          .then(setLinkedTicket)
+          .then(ticket => {
+            if (currentChatRef.current !== chatId) return
+            setLinkedTicket(ticket)
+          })
           .catch(() => {})
       } else {
         setLinkedTicket(null)