diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.kt
index be96391bdb..7e25d10e93 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.kt
@@ -159,9 +159,15 @@ class RetrieveProfileJob private constructor(parameters: Parameters, private val
     SignalDatabase.recipients.markProfilesFetched(successIds, System.currentTimeMillis())
     stopwatch.split("mark-fetched")
 
-    if (operationState.unregistered.isNotEmpty() || newlyRegisteredIds.isNotEmpty()) {
-      Log.i(TAG, "Marking " + newlyRegisteredIds.size + " users as registered and " + operationState.unregistered.size + " users as unregistered.")
-      SignalDatabase.recipients.bulkUpdatedRegisteredStatus(newlyRegisteredIds, operationState.unregistered)
+    if (newlyRegisteredIds.isNotEmpty()) {
+      Log.i(TAG, "Marking " + newlyRegisteredIds.size + " users as registered.")
+      SignalDatabase.recipients.bulkUpdatedRegisteredStatus(newlyRegisteredIds, emptySet())
+    }
+    if (operationState.unregistered.isNotEmpty()) {
+      Log.i(TAG, "Marking " + operationState.unregistered.size + " users as unregistered.")
+      for (recipientId in operationState.unregistered) {
+        SignalDatabase.recipients.markUnregistered(recipientId)
+      }
     }
     stopwatch.split("registered-update")