diff --git a/ts/components/CompositionArea.tsx b/ts/components/CompositionArea.tsx
index f7c7d62ac..9b50d8c87 100644
--- a/ts/components/CompositionArea.tsx
+++ b/ts/components/CompositionArea.tsx
@@ -405,7 +405,7 @@ export const CompositionArea = ({
     />
   ) : null;
 
-  const attButton = (
+  const attButton = linkPreviewResult ? undefined : (
     <div className="CompositionArea__button-cell">
       <button
         type="button"
diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index da117a8d2..53d2bcd85 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -3895,6 +3895,18 @@ export class ConversationModel extends window.Backbone
       [window.ConversationController.getOurConversationIdOrThrow()]
     );
 
+    // If there are link previews present in the message we shouldn't include
+    // any attachments as well.
+    const attachmentsToSend = preview && preview.length ? [] : attachments;
+
+    if (preview && preview.length) {
+      attachments.forEach(attachment => {
+        if (attachment.path) {
+          deleteAttachmentData(attachment.path);
+        }
+      });
+    }
+
     // Here we move attachments to disk
     const messageWithSchema = await upgradeMessageSchema({
       timestamp: now,
@@ -3903,7 +3915,7 @@ export class ConversationModel extends window.Backbone
       conversationId: this.id,
       quote,
       preview,
-      attachments,
+      attachments: attachmentsToSend,
       sent_at: now,
       received_at: window.Signal.Util.incrementMessageCounter(),
       received_at_ms: now,