diff --git a/ts/components/conversation/message/message-content/MessageAttachment.tsx b/ts/components/conversation/message/message-content/MessageAttachment.tsx
index ac44e2a0d..e398e083c 100644
--- a/ts/components/conversation/message/message-content/MessageAttachment.tsx
+++ b/ts/components/conversation/message/message-content/MessageAttachment.tsx
@@ -96,7 +96,7 @@ export const MessageAttachment = (props: Props) => {
     (e: any) => {
       e.stopPropagation();
       e.preventDefault();
-      if (!attachmentProps?.attachments?.length) {
+      if (!attachmentProps?.attachments?.length || attachmentProps?.attachments[0]?.pending) {
         return;
       }
 
@@ -194,10 +194,7 @@ export const MessageAttachment = (props: Props) => {
         </div>
       ) : (
         <div className="module-message__generic-attachment__icon-container">
-          <div
-            role="button"
-            className="module-message__generic-attachment__icon"
-          >
+          <div role="button" className="module-message__generic-attachment__icon">
             {extension ? (
               <div className="module-message__generic-attachment__icon__extension">{extension}</div>
             ) : null}