diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt
index b006095e9a..dc4c240822 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt
@@ -57,9 +57,13 @@ object ContactDiscovery {
     }
 
     if (!SignalStore.registrationValues().isRegistrationComplete) {
-      Log.w(TAG, "Registration is not yet complete. Skipping, but running a routine to possibly mark it complete.")
-      RegistrationUtil.maybeMarkRegistrationComplete()
-      return
+      if (SignalStore.account().isRegistered && SignalStore.svr().lastPinCreateFailed()) {
+        Log.w(TAG, "Registration isn't complete, but only because PIN creation failed. Allowing CDS to continue.")
+      } else {
+        Log.w(TAG, "Registration is not yet complete. Skipping, but running a routine to possibly mark it complete.")
+        RegistrationUtil.maybeMarkRegistrationComplete()
+        return
+      }
     }
 
     refreshRecipients(