diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
index ca98692f9c..8bdc67a05d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
@@ -66,7 +66,7 @@ public class CreateSignedPreKeyJob extends BaseJob {
 
   @Override
   public void onRun() throws IOException {
-    if (!SignalStore.account().isRegistered()) {
+    if (!SignalStore.account().isRegistered() || SignalStore.account().getAci() == null || SignalStore.account().getPni() == null) {
       Log.w(TAG, "Not yet registered...");
       return;
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
index e4b31b6df2..0d0abbb218 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
@@ -77,7 +77,7 @@ public class RefreshPreKeysJob extends BaseJob {
 
   @Override
   public void onRun() throws IOException {
-    if (!SignalStore.account().isRegistered()) {
+    if (!SignalStore.account().isRegistered() || SignalStore.account().getAci() == null || SignalStore.account().getPni() == null) {
       Log.w(TAG, "Not registered. Skipping.");
       return;
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java
index 9e039c9998..33d88f8a40 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java
@@ -58,6 +58,11 @@ public class RotateSignedPreKeyJob extends BaseJob {
 
   @Override
   public void onRun() throws Exception {
+    if (!SignalStore.account().isRegistered() || SignalStore.account().getAci() == null || SignalStore.account().getPni() == null) {
+      Log.w(TAG, "Not registered. Skipping.");
+      return;
+    }
+
     Log.i(TAG, "Rotating signed prekey...");
 
     ACI aci = SignalStore.account().getAci();