diff --git a/web/components/chat/ChatContainer/ChatContainer.tsx b/web/components/chat/ChatContainer/ChatContainer.tsx
index 82b8dbe24..e11a17dde 100644
--- a/web/components/chat/ChatContainer/ChatContainer.tsx
+++ b/web/components/chat/ChatContainer/ChatContainer.tsx
@@ -32,6 +32,10 @@ function shouldCollapseMessages(messages: ChatMessage[], index: number): boolean
   }
 
   const message = messages[index];
+  if (!message || !message.user) {
+    return false;
+  }
+
   const {
     user: { id },
   } = message;