diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index 291cb2fee..d7aacc33f 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -2057,6 +2057,16 @@ export class Message extends React.Component<Props, State> {
         return;
       }
 
+      if (attachments && hasNotDownloaded(attachments[0])) {
+        event.preventDefault();
+        event.stopPropagation();
+        kickOffAttachmentDownload({
+          attachment: attachments[0],
+          messageId: id,
+        });
+        return;
+      }
+
       if (isTapToViewExpired) {
         const action =
           direction === 'outgoing'
@@ -2215,15 +2225,6 @@ export class Message extends React.Component<Props, State> {
       return;
     }
 
-    // If there an incomplete attachment, do not execute the default action
-    const { attachments } = this.props;
-    if (attachments && attachments.length > 0) {
-      const [firstAttachment] = attachments;
-      if (!firstAttachment.url) {
-        return;
-      }
-    }
-
     this.handleOpen(event);
   };