diff --git a/packages/ui/src/components/chat/ChatContainer.tsx b/packages/ui/src/components/chat/ChatContainer.tsx
index d46fb4cb..2fdeabf2 100644
--- a/packages/ui/src/components/chat/ChatContainer.tsx
+++ b/packages/ui/src/components/chat/ChatContainer.tsx
@@ -151,9 +151,7 @@ export const ChatContainer: React.FC = () => {
         }
 
         const hasSessionMessages = messages.has(currentSessionId);
-        const existingMessages = hasSessionMessages ? messages.get(currentSessionId) ?? [] : [];
-
-        if (existingMessages.length > 0) {
+        if (hasSessionMessages) {
             return;
         }
 
diff --git a/packages/ui/src/components/layout/VSCodeLayout.tsx b/packages/ui/src/components/layout/VSCodeLayout.tsx
index a221e0eb..d4dbca35 100644
--- a/packages/ui/src/components/layout/VSCodeLayout.tsx
+++ b/packages/ui/src/components/layout/VSCodeLayout.tsx
@@ -272,11 +272,15 @@ export const VSCodeLayout: React.FC = () => {
         return;
       }
 
-      const hasMessages = messages.has(currentSessionId) && (messages.get(currentSessionId)?.length || 0) > 0;
-      if (!hasMessages) {
-        try {
-          await loadMessages(currentSessionId);
-        } catch { /* ignored */ }
+      const hasMessagesEntry = messages.has(currentSessionId);
+      if (hasMessagesEntry) {
+        return;
+      }
+
+      try {
+        await loadMessages(currentSessionId);
+      } catch {
+        /* ignored */
       }
     };