diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt
index 6128491fbd..6ddcc92064 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt
@@ -330,6 +330,11 @@ object DataMessageProcessor {
       return null
     }
 
+    if (Recipient.resolved(threadRecipientId).isGroup) {
+      warn(envelope.clientTimestamp!!, "Expiration update targeting a group recipient without group context. Ignoring.")
+      return null
+    }
+
     if (SignalDatabase.recipients.getExpiresInSeconds(threadRecipientId) == expiresIn.inWholeSeconds) {
       log(envelope.clientTimestamp!!, "No change in message expiry for group. Ignoring.")
       return null