diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationDataSource.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationDataSource.java
index f2d120b2cb..42dc29c5e3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationDataSource.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationDataSource.java
@@ -159,6 +159,12 @@ public class ConversationDataSource implements PagedDataSource<MessageId, Conver
     MessageDatabase database  = messageId.isMms() ? SignalDatabase.mms() : SignalDatabase.sms();
     MessageRecord   record    = database.getMessageRecordOrNull(messageId.getId());
 
+    if (record instanceof MediaMmsMessageRecord &&
+        ((MediaMmsMessageRecord) record).getParentStoryId() != null &&
+        ((MediaMmsMessageRecord) record).getParentStoryId().isGroupReply()) {
+      return null;
+    }
+
     stopwatch.split("message");
 
     try {