diff --git a/handlers/chat.go b/handlers/chat.go
index b15d5c0d7..efd46c67f 100644
--- a/handlers/chat.go
+++ b/handlers/chat.go
@@ -344,7 +344,7 @@ func (ch *ChatHandler) ProcessChatResponse(w http.ResponseWriter, r *http.Reques
 	}
 
 	message := &db.ChatMessage{
-		ID:        request.MessageID,
+		ID:        xid.New().String(),
 		ChatID:    request.ChatID,
 		Message:   request.Response,
 		Role:      "assistant",