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 bd3d697da..16490c3a7 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/UsernamesManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/UsernamesManager.java
@@ -131,7 +131,7 @@ public class UsernamesManager {
       cacheCluster.useWriteCluster(connection -> {
         final RedisAdvancedClusterAsyncCommands<String, String> asyncCommands = connection.async();
 
-        maybeOldUsername.ifPresent(asyncCommands::del);
+        maybeOldUsername.ifPresent(oldUsername -> asyncCommands.del(getUsernameMapKey(oldUsername)));
         asyncCommands.set(uuidMapKey, username);
         asyncCommands.set(usernameMapKey, uuid.toString());
       });