diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index a9157dfe550..869f26e60cb 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -954,7 +954,9 @@ export class Message extends React.Component<Props, State> {
           attachment: first.image,
           messageId: id,
         });
+        return;
       }
+      openLink(first.url);
     };
     const contents = (
       <>