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 8ad20ed5e..ef3514487 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 && this.messageRecord.isGroupV2()) {
+    if (!this.mentions.isEmpty() && this.body != null && this.messageRecord.getRecipient().isGroup()) {
       MentionAnnotation.setMentionAnnotations(this.body, this.mentions);
     }