diff --git a/apps/web/src/hooks/useChat.ts b/apps/web/src/hooks/useChat.ts
index 8f0cfe0..7283ee5 100644
--- a/apps/web/src/hooks/useChat.ts
+++ b/apps/web/src/hooks/useChat.ts
@@ -294,7 +294,7 @@ export function useChat(options: UseChatOptions = {}): UseChatReturn {
           const response = await sendChatMessage(request);
 
           const assistantMessage: Message = {
-            id: `assistant-${Date.now().toString()}`,
+            id: `assistant-${Date.now().toString()}-${Math.random().toString(36).slice(2, 8)}`,
             role: "assistant",
             content: response.message.content,
             createdAt: new Date().toISOString(),
@@ -328,7 +328,7 @@ export function useChat(options: UseChatOptions = {}): UseChatReturn {
           });
 
           const errorMessage: Message = {
-            id: `error-${String(Date.now())}`,
+            id: `error-${String(Date.now())}-${Math.random().toString(36).slice(2, 8)}`,
             role: "assistant",
             content: "Something went wrong. Please try again.",
             createdAt: new Date().toISOString(),