diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
index dd489ee809..665bb4ee44 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -1715,7 +1715,7 @@ public class MmsDatabase extends MessageDatabase {
 
     long messageId = insertMediaMessage(threadId, retrieved.getBody(), retrieved.getAttachments(), quoteAttachments, retrieved.getSharedContacts(), retrieved.getLinkPreviews(), retrieved.getMentions(), retrieved.getMessageRanges(), contentValues, null, true);
 
-    if (!Types.isExpirationTimerUpdate(mailbox) && !retrieved.getStoryType().isStory() && retrieved.getParentStoryId() == null) {
+    if (!Types.isExpirationTimerUpdate(mailbox) && !retrieved.getStoryType().isStory() && !retrieved.getParentStoryId().isGroupReply()) {
       SignalDatabase.threads().incrementUnread(threadId, 1);
       SignalDatabase.threads().update(threadId, true);
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/ParentStoryId.kt b/app/src/main/java/org/thoughtcrime/securesms/database/model/ParentStoryId.kt
index fc4f4b9f09..d3292b72fc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/ParentStoryId.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/ParentStoryId.kt
@@ -13,6 +13,7 @@ sealed class ParentStoryId(protected val id: Long) {
   abstract fun serialize(): Long
 
   fun asMessageId(): MessageId = MessageId(abs(id), true)
+  fun isGroupReply() = serialize() > 0
 
   /**
    * A parent story who's child should be displayed in a group reply thread.