diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ConversationShortcutUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ConversationShortcutUpdateJob.java
index ee473ba65a..fef9a777e3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ConversationShortcutUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ConversationShortcutUpdateJob.java
@@ -64,6 +64,11 @@ public class ConversationShortcutUpdateJob extends BaseJob {
       return;
     }
 
+    if (SignalStore.account().getAci() == null) {
+      Log.i(TAG, "Need ACI for group shortcuts");
+      return;
+    }
+
     ThreadTable threadTable  = SignalDatabase.threads();
     int         maxShortcuts = ConversationUtil.getMaxShortcuts(context);
     List<Recipient> ranked         = new ArrayList<>(maxShortcuts);