diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
index ce1af069c..7375f21f1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
@@ -653,7 +653,9 @@ public class SmsDatabase extends MessagingDatabase {
     try {
       threadIdsToUpdate.add(threadDatabase.getThreadIdFor(recipient.getId()));
       for (GroupDatabase.GroupRecord groupRecord : groupRecords) {
-        threadIdsToUpdate.add(threadDatabase.getThreadIdFor(groupRecord.getRecipientId()));
+        if (groupRecord.isActive()) {
+          threadIdsToUpdate.add(threadDatabase.getThreadIdFor(groupRecord.getRecipientId()));
+        }
       }
 
       Stream.of(threadIdsToUpdate)