diff --git a/ts/components/conversation/AttachmentList.tsx b/ts/components/conversation/AttachmentList.tsx
index 7f38f9b46f..5dfe1bcc5a 100644
--- a/ts/components/conversation/AttachmentList.tsx
+++ b/ts/components/conversation/AttachmentList.tsx
@@ -99,7 +99,12 @@ export function AttachmentList<
           const url = getUrl(attachment);
           const forUI = attachmentsForUI[index];
 
-          const key = url || attachment.path || attachment.fileName || index;
+          const key =
+            attachment.clientUuid ||
+            url ||
+            attachment.path ||
+            attachment.fileName ||
+            index;
 
           const isImage = isImageAttachment(attachment);
           const isVideo = isVideoAttachment(attachment);