diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/AppRegistrationStorageController.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/AppRegistrationStorageController.kt
index 59b796c828..16c0394022 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/AppRegistrationStorageController.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/AppRegistrationStorageController.kt
@@ -238,6 +238,9 @@ class AppRegistrationStorageController(private val context: Context) : StorageCo
         }
       }.build()
 
+      SignalStore.account.registrationId = data.aciRegistrationId
+      SignalStore.account.pniRegistrationId = data.pniRegistrationId
+
       // TODO [greyson] Should probably move this stuff into this file as we get closer to being done
       RegistrationRepository.registerAccountLocally(context, metadata)
       SignalStore.registration.localRegistrationMetadata = metadata