From 246afe0f2a02ecdfb059a0a604a9bc4ea2b61d94 Mon Sep 17 00:00:00 2001
From: neo773 <62795688+neo773@users.noreply.github.com>
Date: Sun, 22 Mar 2026 15:23:43 +0530
Subject: [PATCH] fix: skip chat messages query when thread ID is the
 unknown-thread default (#18828)

Prevents invalid UUID error on initial mount before a real thread is
selected
---
 .../modules/ai/components/AgentChatMessagesFetchEffect.tsx   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/twenty-front/src/modules/ai/components/AgentChatMessagesFetchEffect.tsx b/packages/twenty-front/src/modules/ai/components/AgentChatMessagesFetchEffect.tsx
index b958e3f37f..08d18601f8 100644
--- a/packages/twenty-front/src/modules/ai/components/AgentChatMessagesFetchEffect.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AgentChatMessagesFetchEffect.tsx
@@ -2,6 +2,7 @@ import { useCallback, useMemo } from 'react';
 import { isDefined } from 'twenty-shared/utils';
 
 import { AGENT_CHAT_REFETCH_MESSAGES_EVENT_NAME } from '@/ai/constants/AgentChatRefetchMessagesEventName';
+import { AGENT_CHAT_UNKNOWN_THREAD_ID } from '@/ai/constants/AgentChatUnknownThreadId';
 import { AGENT_CHAT_NEW_THREAD_DRAFT_KEY } from '@/ai/states/agentChatDraftsByThreadIdState';
 import { agentChatFetchedMessagesComponentFamilyState } from '@/ai/states/agentChatFetchedMessagesComponentFamilyState';
 import { agentChatMessagesLoadingState } from '@/ai/states/agentChatMessagesLoadingState';
@@ -22,7 +23,9 @@ export const AgentChatMessagesFetchEffect = () => {
   const currentAIChatThread = useAtomStateValue(currentAIChatThreadState);
 
   const isNewThread = useMemo(
-    () => currentAIChatThread === AGENT_CHAT_NEW_THREAD_DRAFT_KEY,
+    () =>
+      currentAIChatThread === AGENT_CHAT_NEW_THREAD_DRAFT_KEY ||
+      currentAIChatThread === AGENT_CHAT_UNKNOWN_THREAD_ID,
     [currentAIChatThread],
   );