From ef135f3e2db69077a3ca644493916c15e7da8d76 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Mon, 27 Jul 2026 13:24:34 +0200
Subject: [PATCH] fix(app): guard pending message identity

---
 packages/app/src/agent-stream/view.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/app/src/agent-stream/view.tsx b/packages/app/src/agent-stream/view.tsx
index b12b5b6c7e..0ed4fa0313 100644
--- a/packages/app/src/agent-stream/view.tsx
+++ b/packages/app/src/agent-stream/view.tsx
@@ -668,7 +668,10 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
             client={client}
             isFirstInGroup={layoutItem.isFirstInUserGroup}
             isLastInGroup={layoutItem.isLastInUserGroup}
-            isPending={pendingMessageSubmission?.clientMessageId === item.clientMessageId}
+            isPending={
+              pendingMessageSubmission !== null &&
+              pendingMessageSubmission.clientMessageId === item.clientMessageId
+            }
           />
         );
       },