diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/ContactDiscoveryWriter.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/ContactDiscoveryWriter.java
index 2453ef16c..18f230c14 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/ContactDiscoveryWriter.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/ContactDiscoveryWriter.java
@@ -27,7 +27,7 @@ public class ContactDiscoveryWriter extends AccountDatabaseCrawlerListener {
       throws AccountDatabaseCrawlerRestartException {
     for (Account account : chunkAccounts) {
       if (account.isCanonicallyDiscoverable() != account.shouldBeVisibleInDirectory()) {
-        accounts.update(account);
+        accounts.get(account.getUuid()).ifPresent(accounts::update);
       }
     }
   }