diff --git a/frontend/src/app/chat/page.tsx b/frontend/src/app/chat/page.tsx
index 194aabad..5c7ac6d5 100644
--- a/frontend/src/app/chat/page.tsx
+++ b/frontend/src/app/chat/page.tsx
@@ -1198,7 +1198,7 @@ function ChatPage() {
 					) : (
 						<>
 							{messages.map((message, index) => (
-								<>
+								<div key={`message-${index}-${message.timestamp?.getTime()}`}>
 									{message.role === "user" &&
 										(messages[index]?.content.match(FILES_REGEX)?.[0] ??
 											null) === null && (
@@ -1244,7 +1244,7 @@ function ChatPage() {
 												/>
 											</div>
 										)}
-								</>
+								</div>
 							))}
 
 							{/* Streaming Message Display */}