diff --git a/SessionShareExtension/ThreadPickerVC.swift b/SessionShareExtension/ThreadPickerVC.swift
index 0e0ff5db3..91a193a7e 100644
--- a/SessionShareExtension/ThreadPickerVC.swift
+++ b/SessionShareExtension/ThreadPickerVC.swift
@@ -162,7 +162,7 @@ final class ThreadPickerVC: UIViewController, UITableViewDataSource, UITableView
         message.sentTimestamp = NSDate.millisecondTimestamp()
         message.text = (isSharingUrl && (messageText?.isEmpty == true || attachments[0].linkPreviewDraft == nil) ?
             (
-                (messageText?.isEmpty == true ?
+                (messageText?.isEmpty == true || (attachments[0].text() == messageText) ?
                     attachments[0].text() :
                     "\(attachments[0].text() ?? "")\n\n\(messageText ?? "")"
                 )