1 files changed, 4 insertions, 2 deletions
diff --git a/packages/cli/src/ui/hooks/useConsoleMessages.ts b/packages/cli/src/ui/hooks/useConsoleMessages.ts
index 90dc6f81..52ffbd39 100644
--- a/packages/cli/src/ui/hooks/useConsoleMessages.ts
+++ b/packages/cli/src/ui/hooks/useConsoleMessages.ts
@@ -25,9 +25,12 @@ export function useConsoleMessages(): UseConsoleMessagesReturn {
       return;
     }
 
+    const newMessagesToAdd = messageQueueRef.current;
+    messageQueueRef.current = [];
+
     setConsoleMessages((prevMessages) => {
       const newMessages = [...prevMessages];
-      messageQueueRef.current.forEach((queuedMessage) => {
+      newMessagesToAdd.forEach((queuedMessage) => {
         if (
           newMessages.length > 0 &&
           newMessages[newMessages.length - 1].type === queuedMessage.type &&
@@ -42,7 +45,6 @@ export function useConsoleMessages(): UseConsoleMessagesReturn {
       return newMessages;
     });
 
-    messageQueueRef.current = [];
     messageQueueTimeoutRef.current = null; // Allow next scheduling
   }, []);