diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
index 43bc5d9e73..49fdb80821 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
@@ -318,6 +318,10 @@ public class InputPanel extends ConstraintLayout
     }
   }
 
+  public boolean hasLinkPreview() {
+    return linkPreview.getVisibility() == View.VISIBLE;
+  }
+
   public void setLinkPreviewLoading() {
     this.linkPreview.setVisibility(View.VISIBLE);
     this.linkPreview.setLoading();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index 05fe536b17..66cac3a37b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -332,6 +332,7 @@ import org.thoughtcrime.securesms.util.getQuote
 import org.thoughtcrime.securesms.util.getRecordQuoteType
 import org.thoughtcrime.securesms.util.hasAudio
 import org.thoughtcrime.securesms.util.hasGiftBadge
+import org.thoughtcrime.securesms.util.hasLinkPreview
 import org.thoughtcrime.securesms.util.hasNonTextSlide
 import org.thoughtcrime.securesms.util.isValidReactionTarget
 import org.thoughtcrime.securesms.util.padding
@@ -1667,7 +1668,8 @@ class ConversationFragment :
 
     if (editMessage.body == composeText.editableText.toString() &&
       editMessage.getQuote()?.displayText?.toString() == inputPanel.quote.map { it.text }.orNull() &&
-      editMessage.messageRanges == composeText.styling
+      editMessage.messageRanges == composeText.styling &&
+      editMessage.hasLinkPreview() == inputPanel.hasLinkPreview()
     ) {
       Log.d(TAG, "Updated message matches original, exiting edit mode")
       inputPanel.exitEditMessageMode()