diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AccountConsistencyWorkerJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/AccountConsistencyWorkerJob.kt
index 3143231c72..b7fca67278 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AccountConsistencyWorkerJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AccountConsistencyWorkerJob.kt
@@ -43,6 +43,11 @@ class AccountConsistencyWorkerJob private constructor(parameters: Parameters) :
       return
     }
 
+    if (!SignalStore.account().isRegistered || SignalStore.account().aci == null) {
+      Log.i(TAG, "Not yet registered, skipping.")
+      return
+    }
+
     val profile: SignalServiceProfile = ProfileUtil.retrieveProfileSync(context, Recipient.self(), SignalServiceProfile.RequestType.PROFILE, false).profile
     val encodedPublicKey = Base64.encodeBytes(SignalStore.account().aciIdentityKey.publicKey.serialize())
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/AccountConsistencyMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/AccountConsistencyMigrationJob.kt
index 7312ba66fc..30294af951 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/AccountConsistencyMigrationJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/AccountConsistencyMigrationJob.kt
@@ -29,6 +29,11 @@ internal class AccountConsistencyMigrationJob(
       return
     }
 
+    if (!SignalStore.account().isRegistered || SignalStore.account().aci == null) {
+      Log.i(TAG, "Not yet registered, skipping.")
+      return
+    }
+
     ApplicationDependencies.getJobManager().add(AccountConsistencyWorkerJob())
   }