diff --git a/packages/trace-viewer/src/ui/attachmentsTab.tsx b/packages/trace-viewer/src/ui/attachmentsTab.tsx
index 375f28cb65..8c72c7fee3 100644
--- a/packages/trace-viewer/src/ui/attachmentsTab.tsx
+++ b/packages/trace-viewer/src/ui/attachmentsTab.tsx
@@ -131,7 +131,7 @@ export const AttachmentsTab: React.FunctionComponent<{
     })}
     {attachments.size ? <div className='attachments-section'>Attachments</div> : undefined}
     {[...attachments.values()].map((a, i) => {
-      return <div className='attachment-item' key={`attachment-${i}`}>
+      return <div className='attachment-item' key={attachmentKey(a, i)}>
         <ExpandableAttachment attachment={a} />
       </div>;
     })}
@@ -154,3 +154,7 @@ function downloadURL(attachment: Attachment) {
     params.dct = attachment.contentType;
   return attachmentURL(attachment, params);
 }
+
+function attachmentKey(attachment: Attachment, index: number) {
+  return index + '-' + (attachment.sha1 ? `sha1-` + attachment.sha1 : `path-` + attachment.path);
+}