diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java
index d08d86a0a9..8ad20ed5e9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java
@@ -52,7 +52,7 @@ public class ConversationMessage {
       this.body = null;
     }
 
-    if (!this.mentions.isEmpty() && this.body != null) {
+    if (!this.mentions.isEmpty() && this.body != null && this.messageRecord.isGroupV2()) {
       MentionAnnotation.setMentionAnnotations(this.body, this.mentions);
     }
 
diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java
index 6f83da0ca3..770f3be72d 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java
@@ -1041,7 +1041,7 @@ public final class SignalServiceContent {
     }
 
     if (mentions.size() > 0 && !isGroupV2) {
-      throw new InvalidMessageStructureException("Mentions received in non-GV2 message");
+      Log.w(TAG, "Mentions received in non-GV2 message");
     }
 
     return mentions;