diff --git a/routes/_components/status/Media.html b/routes/_components/status/Media.html
index b21253fe..000a31c4 100644
--- a/routes/_components/status/Media.html
+++ b/routes/_components/status/Media.html
@@ -134,7 +134,7 @@
       originalWidth: original => original && original.width,
       originalHeight: original => original && original.height,
       noNativeWidthHeight: (smallWidth, smallHeight) => typeof smallWidth !== 'number' || typeof smallHeight !== 'number',
-      delegateKey: (media) => `media-${media.id}`
+      delegateKey: (media, uuid) => `media-${uuid}-${media.id}`
     },
     methods: {
       async onClickPlayVideoButton() {
diff --git a/routes/_components/status/MediaAttachments.html b/routes/_components/status/MediaAttachments.html
index 002d8986..98c6116a 100644
--- a/routes/_components/status/MediaAttachments.html
+++ b/routes/_components/status/MediaAttachments.html
@@ -1,7 +1,7 @@
 <div class="status-media {{sensitive ? 'status-media-is-sensitive' : ''}}"
      style="grid-template-columns: repeat(auto-fit, minmax({{maxMediaWidth}}px, 1fr));" >
   {{#each mediaAttachments as media}}
-    <Media :media />
+    <Media :media :uuid />
   {{/each}}
 </div>
 <style>
diff --git a/routes/_components/status/StatusMediaAttachments.html b/routes/_components/status/StatusMediaAttachments.html
index e809d6b1..fdec5b1e 100644
--- a/routes/_components/status/StatusMediaAttachments.html
+++ b/routes/_components/status/StatusMediaAttachments.html
@@ -12,7 +12,7 @@
       </svg>
     </div>
   </button>
-  <MediaAttachments :mediaAttachments :sensitive />
+  <MediaAttachments :mediaAttachments :sensitive :uuid />
   {{else}}
     <button type="button"
             class="status-sensitive-media-button"
@@ -31,7 +31,7 @@
   {{/if}}
 </div>
 {{else}}
-  <MediaAttachments :mediaAttachments :sensitive />
+  <MediaAttachments :mediaAttachments :sensitive :uuid />
 {{/if}}
 <style>
   .status-sensitive-media-container {