diff --git a/pages/chat/@id/+Page.tsx b/pages/chat/@id/+Page.tsx
index c0e70b3..e60496a 100644
--- a/pages/chat/@id/+Page.tsx
+++ b/pages/chat/@id/+Page.tsx
@@ -208,8 +208,7 @@ function Messages({
     <Stack gap="md" justify="flex-start">
       {messages.map((message, index) => (
         <Group
-          // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
-          key={index}
+          key={"id" in message ? message.id : index}
           justify={message.role === "user" ? "flex-end" : "flex-start"}
         >
           <HoverCard