diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java
index 90ea5c4be7..92f798c119 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java
@@ -236,10 +236,13 @@ public final class PushDecryptMessageJob extends BaseJob {
     if (sender == null) throw new NoSenderException();
 
     GroupId groupId = null;
-    try {
-      groupId = GroupUtil.idFromGroupContext(e.getGroup().orNull());
-    } catch (BadGroupIdException ex) {
-      Log.w(TAG, "Bad group id found in unsupported data message", ex);
+
+    if (e.getGroup().isPresent()) {
+      try {
+        groupId = GroupUtil.idFromGroupContext(e.getGroup().get());
+      } catch (BadGroupIdException ex) {
+        Log.w(TAG, "Bad group id found in unsupported data message", ex);
+      }
     }
 
     return new PushProcessMessageJob.ExceptionMetadata(sender,