diff --git a/src/lib/EditMessage.svelte b/src/lib/EditMessage.svelte
index d4f9b9c..3c4d5e5 100644
--- a/src/lib/EditMessage.svelte
+++ b/src/lib/EditMessage.svelte
@@ -178,7 +178,6 @@
 
 </script>
 
-{#key message.uuid}
 <article
   id="{'message-' + message.uuid}"
   class="message chat-message" 
@@ -303,5 +302,3 @@
 
   </div>
 </article>
-{/key}
-
diff --git a/src/lib/Messages.svelte b/src/lib/Messages.svelte
index 0ae9022..4f9ccba 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} />
+  {#key message.uuid}<EditMessage bind:message={message} chatId={chatId} />{/key}
   {/if}
 {/each}