diff --git a/src/lib/components/chat/Messages.svelte b/src/lib/components/chat/Messages.svelte
index 3920a40d2..8669f97b7 100644
--- a/src/lib/components/chat/Messages.svelte
+++ b/src/lib/components/chat/Messages.svelte
@@ -215,42 +215,44 @@
 {#if messages.length == 0}
 	<Placeholder models={selectedModels} modelfiles={selectedModelfiles} />
 {:else}
-	{#each messages as message, messageIdx}
-		<div class=" w-full">
-			<div class="flex justify-between px-5 mb-3 max-w-3xl mx-auto rounded-lg group">
-				{#if message.role === 'user'}
-					<UserMessage
-						user={$user}
-						{message}
-						siblings={message.parentId !== null
-							? history.messages[message.parentId]?.childrenIds ?? []
-							: Object.values(history.messages)
-									.filter((message) => message.parentId === null)
-									.map((message) => message.id) ?? []}
-						{confirmEditMessage}
-						{showPreviousMessage}
-						{showNextMessage}
-						{copyToClipboard}
-					/>
-				{:else}
-					<ResponseMessage
-						{message}
-						modelfiles={selectedModelfiles}
-						siblings={history.messages[message.parentId]?.childrenIds ?? []}
-						isLastMessage={messageIdx + 1 === messages.length}
-						{confirmEditResponseMessage}
-						{showPreviousMessage}
-						{showNextMessage}
-						{rateMessage}
-						{copyToClipboard}
-						{regenerateResponse}
-					/>
-				{/if}
+	{#key chatId}
+		{#each messages as message, messageIdx}
+			<div class=" w-full">
+				<div class="flex justify-between px-5 mb-3 max-w-3xl mx-auto rounded-lg group">
+					{#if message.role === 'user'}
+						<UserMessage
+							user={$user}
+							{message}
+							siblings={message.parentId !== null
+								? history.messages[message.parentId]?.childrenIds ?? []
+								: Object.values(history.messages)
+										.filter((message) => message.parentId === null)
+										.map((message) => message.id) ?? []}
+							{confirmEditMessage}
+							{showPreviousMessage}
+							{showNextMessage}
+							{copyToClipboard}
+						/>
+					{:else}
+						<ResponseMessage
+							{message}
+							modelfiles={selectedModelfiles}
+							siblings={history.messages[message.parentId]?.childrenIds ?? []}
+							isLastMessage={messageIdx + 1 === messages.length}
+							{confirmEditResponseMessage}
+							{showPreviousMessage}
+							{showNextMessage}
+							{rateMessage}
+							{copyToClipboard}
+							{regenerateResponse}
+						/>
+					{/if}
+				</div>
 			</div>
-		</div>
-	{/each}
+		{/each}
 
-	{#if bottomPadding}
-		<div class=" mb-10" />
-	{/if}
+		{#if bottomPadding}
+			<div class=" mb-10" />
+		{/if}
+	{/key}
 {/if}
diff --git a/src/lib/components/chat/Messages/ResponseMessage.svelte b/src/lib/components/chat/Messages/ResponseMessage.svelte
index 2bf4c42ba..6f821b46c 100644
--- a/src/lib/components/chat/Messages/ResponseMessage.svelte
+++ b/src/lib/components/chat/Messages/ResponseMessage.svelte
@@ -33,8 +33,6 @@
 	let speaking = null;
 
 	$: if (message) {
-		edit = false;
-		editedContent = '';
 		renderStyling();
 	}
 
diff --git a/src/lib/components/chat/Messages/UserMessage.svelte b/src/lib/components/chat/Messages/UserMessage.svelte
index f5be0af32..693d20e23 100644
--- a/src/lib/components/chat/Messages/UserMessage.svelte
+++ b/src/lib/components/chat/Messages/UserMessage.svelte
@@ -39,11 +39,6 @@
 		edit = false;
 		editedContent = '';
 	};
-
-	$: if (message) {
-		edit = false;
-		editedContent = '';
-	}
 </script>
 
 <div class=" flex w-full">