diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
index 80343891e..966d62806 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
@@ -194,6 +194,7 @@ public class AccountsManager {
         if (!originalUuid.equals(actualUuid)) {
           messagesManager.clear(actualUuid);
           keys.delete(actualUuid);
+          keys.delete(account.getPhoneNumberIdentifier());
           profilesManager.deleteAll(actualUuid);
         }
 
@@ -221,6 +222,7 @@ public class AccountsManager {
 
   public Account changeNumber(final Account account, final String number) throws InterruptedException {
     final String originalNumber = account.getNumber();
+    final UUID originalPhoneNumberIdentifier = account.getPhoneNumberIdentifier();
 
     if (originalNumber.equals(number)) {
       return account;
@@ -261,6 +263,9 @@ public class AccountsManager {
       updatedAccount.set(numberChangedAccount);
       directoryQueue.changePhoneNumber(numberChangedAccount, originalNumber, number);
 
+      keys.delete(phoneNumberIdentifier);
+      keys.delete(originalPhoneNumberIdentifier);
+
       return displacedUuid;
     });
 
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerTest.java
index 1fa2d96b3..f7af3d7cd 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerTest.java
@@ -65,6 +65,8 @@ class AccountsManagerTest {
   private ProfilesManager profilesManager;
   private ReservedUsernames reservedUsernames;
 
+  private Map<String, UUID> phoneNumberIdentifiersByE164;
+
   private RedisAdvancedClusterCommands<String, String> commands;
   private AccountsManager accountsManager;
 
@@ -112,7 +114,7 @@ class AccountsManagerTest {
     when(backupClient.deleteBackups(any())).thenReturn(CompletableFuture.completedFuture(null));
 
     final PhoneNumberIdentifiers phoneNumberIdentifiers = mock(PhoneNumberIdentifiers.class);
-    final Map<String, UUID> phoneNumberIdentifiersByE164 = new HashMap<>();
+    phoneNumberIdentifiersByE164 = new HashMap<>();
 
     when(phoneNumberIdentifiers.getPhoneNumberIdentifier(anyString())).thenAnswer((Answer<UUID>) invocation -> {
       final String number = invocation.getArgument(0, String.class);
@@ -532,9 +534,13 @@ class AccountsManagerTest {
     final AccountAttributes attributes = new AccountAttributes(false, 0, null, null, true, null);
     accountsManager.create(e164, "password", null, attributes, new ArrayList<>());
 
-    verify(accounts).create(
-        argThat(account -> e164.equals(account.getNumber()) && existingUuid.equals(account.getUuid())));
+    assertTrue(phoneNumberIdentifiersByE164.containsKey(e164));
+
+    verify(accounts)
+        .create(argThat(account -> e164.equals(account.getNumber()) && existingUuid.equals(account.getUuid())));
+
     verify(keys).delete(existingUuid);
+    verify(keys).delete(phoneNumberIdentifiersByE164.get(e164));
     verify(messagesManager).clear(existingUuid);
     verify(profilesManager).deleteAll(existingUuid);
   }
@@ -646,13 +652,18 @@ class AccountsManagerTest {
     final String originalNumber = "+14152222222";
     final String targetNumber = "+14153333333";
     final UUID uuid = UUID.randomUUID();
+    final UUID originalPni = UUID.randomUUID();
 
-    Account account = new Account(originalNumber, uuid, UUID.randomUUID(), new HashSet<>(), new byte[16]);
+    Account account = new Account(originalNumber, uuid, originalPni, new HashSet<>(), new byte[16]);
     account = accountsManager.changeNumber(account, targetNumber);
 
     assertEquals(targetNumber, account.getNumber());
 
+    assertTrue(phoneNumberIdentifiersByE164.containsKey(targetNumber));
+
     verify(directoryQueue).changePhoneNumber(argThat(a -> a.getUuid().equals(uuid)), eq(originalNumber), eq(targetNumber));
+    verify(keys).delete(originalPni);
+    verify(keys).delete(phoneNumberIdentifiersByE164.get(targetNumber));
   }
 
   @Test
@@ -665,6 +676,7 @@ class AccountsManagerTest {
     assertEquals(number, account.getNumber());
     verify(deletedAccountsManager, never()).lockAndPut(anyString(), anyString(), any());
     verify(directoryQueue, never()).changePhoneNumber(any(), any(), any());
+    verify(keys, never()).delete(any());
   }
 
   @Test
@@ -676,17 +688,23 @@ class AccountsManagerTest {
     final String targetNumber = "+14153333333";
     final UUID existingAccountUuid = UUID.randomUUID();
     final UUID uuid = UUID.randomUUID();
+    final UUID originalPni = UUID.randomUUID();
+    final UUID targetPni = UUID.randomUUID();
 
-    final Account existingAccount = new Account(targetNumber, existingAccountUuid, UUID.randomUUID(), new HashSet<>(), new byte[16]);
+    final Account existingAccount = new Account(targetNumber, existingAccountUuid, targetPni, new HashSet<>(), new byte[16]);
     when(accounts.getByE164(targetNumber)).thenReturn(Optional.of(existingAccount));
 
-    Account account = new Account(originalNumber, uuid, UUID.randomUUID(), new HashSet<>(), new byte[16]);
+    Account account = new Account(originalNumber, uuid, originalPni, new HashSet<>(), new byte[16]);
     account = accountsManager.changeNumber(account, targetNumber);
 
     assertEquals(targetNumber, account.getNumber());
 
+    assertTrue(phoneNumberIdentifiersByE164.containsKey(targetNumber));
+
     verify(directoryQueue).changePhoneNumber(argThat(a -> a.getUuid().equals(uuid)), eq(originalNumber), eq(targetNumber));
     verify(directoryQueue).deleteAccount(existingAccount);
+    verify(keys).delete(originalPni);
+    verify(keys).delete(targetPni);
   }
 
   @Test