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
+            }
           />
         );
       },