diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt
index f9c9a1f149..8ee18e1265 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt
@@ -279,6 +279,7 @@ class ChangeNumberRepository(
         )
       )
       pniMetadataStore.isSignedPreKeyRegistered = true
+      pniMetadataStore.lastResortKyberPreKeyId = pniLastResortKyberPreKeyId
 
       pniProtocolStore.identities().saveIdentityWithoutSideEffects(
         Recipient.self().id,