diff --git a/src/components/visitor-chat/AdminVisitorChats.tsx b/src/components/visitor-chat/AdminVisitorChats.tsx
index b78e399b9..4863b450d 100644
--- a/src/components/visitor-chat/AdminVisitorChats.tsx
+++ b/src/components/visitor-chat/AdminVisitorChats.tsx
@@ -136,6 +136,9 @@ function ChatPanel({
     refetchInterval: chatPollMs,
     retry: false,
   })
+  useEffect(() => {
+    if (target?.chatId) setSelected(target.chatId)
+  }, [target?.chatId])
   useEffect(() => {
     setChat(undefined)
     setDraft('')