diff --git a/src/lib/components/chat/Messages/ResponseMessage.svelte b/src/lib/components/chat/Messages/ResponseMessage.svelte
index 6f821b46..2bf4c42b 100644
--- a/src/lib/components/chat/Messages/ResponseMessage.svelte
+++ b/src/lib/components/chat/Messages/ResponseMessage.svelte
@@ -33,6 +33,8 @@
 	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 693d20e2..f5be0af3 100644
--- a/src/lib/components/chat/Messages/UserMessage.svelte
+++ b/src/lib/components/chat/Messages/UserMessage.svelte
@@ -39,6 +39,11 @@
 		edit = false;
 		editedContent = '';
 	};
+
+	$: if (message) {
+		edit = false;
+		editedContent = '';
+	}
 </script>
 
 <div class=" flex w-full">