diff --git a/apps/web/src/components/PageComponents/Messages/ChannelChat.tsx b/apps/web/src/components/PageComponents/Messages/ChannelChat.tsx
index f9a08744e..a2f4d73af 100644
--- a/apps/web/src/components/PageComponents/Messages/ChannelChat.tsx
+++ b/apps/web/src/components/PageComponents/Messages/ChannelChat.tsx
@@ -147,9 +147,11 @@ export const ChannelChat = ({ messages = [] }: ChannelChatProps) => {
       {groups.map(({ dayKey, label, items }) => (
         <Fragment key={dayKey}>
           {/* Render messages first, then delimiter — with flex-col-reverse this shows the delimiter above that day's messages */}
-          {items.map((message) => (
+          {items.map((message, index) => (
             <Suspense
-              key={message.messageId ?? `${message.from}-${message.date}`}
+              key={
+                message.messageId ?? `${message.from}-${message.date}-${index}`
+              }
               fallback={<MessageSkeleton />}
             >
               <MessageItem message={message} />