diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
index b7e8f05d4e..30b9af0c71 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
@@ -201,7 +201,7 @@ public final class LiveRecipientCache {
 
       stopwatch.split("thread");
 
-      if (SignalStore.registrationValues().isRegistrationComplete()) {
+      if (SignalStore.registrationValues().isRegistrationComplete() && SignalStore.account().getAci() != null) {
         try (Cursor cursor = SignalDatabase.recipients().getNonGroupContacts(false)) {
           int count = 0;
           while (cursor != null && cursor.moveToNext() && count < CONTACT_CACHE_WARM_MAX) {