diff --git a/web-chat/src/ChatList.tsx b/web-chat/src/ChatList.tsx
index 2ffea42a3a..77917bb80e 100644
--- a/web-chat/src/ChatList.tsx
+++ b/web-chat/src/ChatList.tsx
@@ -11,7 +11,8 @@ export default function ChatList(props: Props) {
 
   const listItems = messages.map((currentMessage) => (
     <Message
-      key={currentMessage.timestamp.toString()}
+      // We assume that the same user is not sending two messages in the same second
+      key={currentMessage.timestamp.toString() + currentMessage.nick}
       authorName={currentMessage.nick}
       date={formatDisplayDate(currentMessage)}
     >