diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/UsernamesManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/UsernamesManager.java
index 4bd329e35..bd3d697da 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/UsernamesManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/UsernamesManager.java
@@ -181,18 +181,16 @@ public class UsernamesManager {
       final String uuidMapKey = getUuidMapKey(uuid);
 
       redisGet(uuid).ifPresent(username -> {
-        jedis.del(getUsernameMapKey(username));
+        final String usernameMapKey = getUsernameMapKey(username);
+
+        jedis.del(usernameMapKey);
         jedis.del(uuidMapKey);
-      });
 
-      cacheCluster.useWriteCluster(connection -> {
-        final RedisAdvancedClusterAsyncCommands<String, String> asyncCommands = connection.async();
+        cacheCluster.useWriteCluster(connection -> {
+          final RedisAdvancedClusterAsyncCommands<String, String> asyncCommands = connection.async();
 
-        asyncCommands.get(uuidMapKey).thenAccept(username -> {
-          if (username != null) {
-            asyncCommands.del(getUsernameMapKey(username));
-            asyncCommands.del(uuidMapKey);
-          }
+          asyncCommands.del(usernameMapKey);
+          asyncCommands.del(uuidMapKey);
         });
       });
     }