diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt
index 6e5dab875..b0eccee7f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt
@@ -60,6 +60,10 @@ object ContactDiscoveryRefreshV2 {
 
     val newE164s: Set<String> = newRecipientE164s + newSystemE164s
 
+    if (newE164s.isEmpty() && previousE164s.isEmpty()) {
+      return ContactDiscovery.RefreshResult(emptySet(), emptyMap())
+    }
+
     val tokenToUse: ByteArray? = if (previousE164s.isNotEmpty()) {
       SignalStore.misc().cdsToken
     } else {