diff --git a/frontend/src/lib/components/sessions/message.svelte b/frontend/src/lib/components/sessions/message.svelte
index fe1c8d659d62ccc6adbd3b7a481d8483c89cad74..5092629419fa7c22086cddb19e652bb11ea0138c 100644
--- a/frontend/src/lib/components/sessions/message.svelte
+++ b/frontend/src/lib/components/sessions/message.svelte
@@ -8,7 +8,6 @@
 	import { onMount } from 'svelte';
 	import SpellCheck from '$lib/components/icons/spellCheck.svelte';
 	import ChatBubble from '../icons/chatBubble.svelte';
-	import { get } from 'svelte/store';
 	import type Feedback from '$lib/types/feedback';
 	import linkifyHtml from 'linkify-html';
 	import { sanitize } from '$lib/utils/sanitize';
@@ -177,7 +176,7 @@
 	>
 		<div contenteditable={isEdit} bind:this={contentDiv} class:bg-blue-900={isEdit}>
 			{#each parts as part}
-				{#if part.feedback}
+				{#if part.feedback && !isEdit}
 					{#if part.feedback.content}
 						<span class="tooltip tooltip-accent" data-tip={part.feedback.content}
 							><!--
diff --git a/frontend/src/lib/types/message.ts b/frontend/src/lib/types/message.ts
index cc13714cd251dd4813ee01855de981ae696d3ec7..2da26f4ae82e2bb80776e1b97e41d0a1ac45cd4e 100644
--- a/frontend/src/lib/types/message.ts
+++ b/frontend/src/lib/types/message.ts
@@ -2,7 +2,7 @@ import Session from './session';
 import User from './user';
 import { updateMessageAPI, createMessageFeedbackAPI } from '$lib/api/sessions';
 import { toastAlert } from '$lib/utils/toasts';
-import { writable, type Writable } from 'svelte/store';
+import { get, writable, type Writable } from 'svelte/store';
 import Feedback from './feedback';
 import { parseToLocalDate } from '$lib/utils/date';
 
@@ -77,12 +77,14 @@ export default class Message {
 		this._versions.update((v) => [...v, { content: content, date: new Date() }]);
 		this._content = content;
 		this._edited = true;
+		this.feedbacks.set([]);
 
 		return true;
 	}
 
 	async localUpdate(content: string, force: boolean = false): Promise<boolean> {
 		this._content = content;
+		this.feedbacks.set([]);
 		if (!force) this._edited = true;
 
 		return true;
@@ -181,6 +183,7 @@ export default class Message {
 				prev._content = m.content;
 				prev._id = m.id;
 				prev._edited = true;
+				prev.feedbacks.set(get(m.feedbacks));
 			}
 		}