diff --git a/src/lib/Messages.svelte b/src/lib/Messages.svelte
index 5a6c482..a116103 100644
--- a/src/lib/Messages.svelte
+++ b/src/lib/Messages.svelte
@@ -14,6 +14,6 @@
 
 {#each messages as message, i}
   {#if !((message.summarized) && $globalStorage.hideSummarized) && !(i === 0 && message.role === 'system' && !chatSettings.useSystemPrompt)}
-  <EditMessage bind:message={message} chatId={chatId} chat={chat} />
+  {#key message.uuid}<EditMessage bind:message={message} chatId={chatId} chat={chat} />{/key}
   {/if}
 {/each}