diff --git a/client/src/routes/Chat.jsx b/client/src/routes/Chat.jsx
index 04cdf93a95..2d1607baa4 100644
--- a/client/src/routes/Chat.jsx
+++ b/client/src/routes/Chat.jsx
@@ -68,7 +68,7 @@ export default function Chat() {
 
   return (
     <>
-      {conversationId == 'new' ? <Landing /> : <Messages />}
+      {conversationId === 'new' && !!messagesTree?.length ? <Landing /> : <Messages />}
       <TextChat />
     </>
   );