diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte
index 546a5a178a..a93913cf18 100644
--- a/src/lib/components/chat/Chat.svelte
+++ b/src/lib/components/chat/Chat.svelte
@@ -1478,6 +1478,7 @@
 						for (const messageId of history.messages[message.parentId].childrenIds) {
 							history.messages[messageId].done = true;
 						}
+						message.done = true;
 						await processNextInQueue($chatId);
 					} else {
 						message.done = true;
@@ -4228,10 +4229,6 @@
 				}
 			}
 
-			if (responseMessage) {
-				history.messages[responseMessage.id] = responseMessage;
-			}
-
 			if (shouldAutoScrollResponse()) {
 				scrollToBottom();
 			}