diff --git a/src/lib/components/notes/NoteEditor/Chat.svelte b/src/lib/components/notes/NoteEditor/Chat.svelte
index 6cbff1b03d..6ec00aa08c 100644
--- a/src/lib/components/notes/NoteEditor/Chat.svelte
+++ b/src/lib/components/notes/NoteEditor/Chat.svelte
@@ -164,6 +164,10 @@
 			loading = true;
 			await chatCompletionHandler();
 
+			messages = messages.filter((message) => {
+				return message.content !== '';
+			});
+
 			loading = false;
 			stopResponseFlag = false;
 		}
diff --git a/src/lib/components/notes/NoteEditor/Chat/Message.svelte b/src/lib/components/notes/NoteEditor/Chat/Message.svelte
index d3e686312b..b7ca0cf20a 100644
--- a/src/lib/components/notes/NoteEditor/Chat/Message.svelte
+++ b/src/lib/components/notes/NoteEditor/Chat/Message.svelte
@@ -17,12 +17,34 @@
 </script>
 
 <div class="flex flex-col gap-1 group">
-	<div class="flex items-start pt-1">
-		<div
-			class="px-2 py-1 text-sm font-semibold uppercase min-w-[6rem] text-left rounded-lg transition"
-		>
+	<div class="flex items-center justify-between pt-1 px-2">
+		<div class="py-1 text-sm font-semibold uppercase min-w-[6rem] text-left rounded-lg transition">
 			{$i18n.t(message.role)}
 		</div>
+
+		<div class="flex items-center">
+			<button
+				class=" text-transparent group-hover:text-gray-500 dark:hover:text-gray-300 transition"
+				on:click={() => {
+					onDelete();
+				}}
+			>
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					fill="none"
+					viewBox="0 0 24 24"
+					stroke-width="2"
+					stroke="currentColor"
+					class="size-4"
+				>
+					<path
+						stroke-linecap="round"
+						stroke-linejoin="round"
+						d="M15 12H9m12 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"
+					/>
+				</svg>
+			</button>
+		</div>
 	</div>
 
 	<div class="flex-1">