diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
index d5b3dceedc..4441f55375 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
@@ -1730,8 +1730,8 @@ object BackupRepository {
 
   data class SelfData(
     val aci: ACI,
-    val pni: PNI,
-    val e164: String,
+    val pni: PNI?,
+    val e164: String?,
     val profileKey: ProfileKey
   )
 
@@ -1838,7 +1838,7 @@ object BackupRepository {
     }
 
     val self = Recipient.self()
-    val selfData = SelfData(self.aci.get(), self.pni.get(), self.e164.get(), ProfileKey(self.profileKey))
+    val selfData = SelfData(self.aci.get(), self.pni.orElse(null), self.e164.orElse(null), ProfileKey(self.profileKey))
     Log.i(TAG, "[remoteRestore] Importing backup")
     val result = importSignalBackup(
       length = tempBackupFile.length(),
@@ -1924,7 +1924,7 @@ object BackupRepository {
     )
 
     val self = Recipient.self()
-    val selfData = SelfData(self.aci.get(), self.pni.get(), self.e164.get(), ProfileKey(self.profileKey))
+    val selfData = SelfData(self.aci.get(), self.pni.orElse(null), self.e164.orElse(null), ProfileKey(self.profileKey))
     Log.i(TAG, "[restoreLinkAndSyncBackup] Importing backup")
     val result = importLinkAndSyncSignalBackup(
       length = tempBackupFile.length(),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundViewModel.kt
index d46be1649c..401dab7a93 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundViewModel.kt
@@ -185,7 +185,7 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
 
     val self = Recipient.self()
     val aci = customCredentials?.aci ?: self.aci.get()
-    val selfData = BackupRepository.SelfData(aci, self.pni.get(), self.e164.get(), ProfileKey(self.profileKey))
+    val selfData = BackupRepository.SelfData(aci, self.pni.orElse(null), self.e164.orElse(null), ProfileKey(self.profileKey))
     val backupKey = customCredentials?.messageBackupKey ?: SignalStore.backup.messageBackupKey
 
     disposables += Single.fromCallable { BackupRepository.importForDebugging(length, inputStreamFactory, selfData, backupKey) }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/RestoreLocalBackupActivityViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/RestoreLocalBackupActivityViewModel.kt
index b868d7337a..c0cc9581e4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/RestoreLocalBackupActivityViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/RestoreLocalBackupActivityViewModel.kt
@@ -84,7 +84,7 @@ class RestoreLocalBackupActivityViewModel : ViewModel() {
       internalState.update { it.copy(restorePhase = RestorePhase.RESTORING) }
 
       val self = Recipient.self()
-      val selfData = BackupRepository.SelfData(self.aci.get(), self.pni.get(), self.e164.get(), ProfileKey(self.profileKey))
+      val selfData = BackupRepository.SelfData(self.aci.get(), self.pni.orElse(null), self.e164.orElse(null), ProfileKey(self.profileKey))
 
       val backupDirectory = SignalStore.backup.newLocalBackupsDirectory
       if (backupDirectory == null) {
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 8ec551d753..89655f1b4e 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
@@ -439,7 +439,7 @@ class AppRegistrationStorageController(private val context: Context) : StorageCo
         val selfPni = SignalStore.account.pni
         val selfE164 = SignalStore.account.e164
 
-        if (selfAci == null || selfPni == null || selfE164 == null) {
+        if (selfAci == null) {
           trySend(LocalBackupRestoreProgress.Error(IllegalStateException("Account not registered, cannot restore V2 backup")))
           return@launch
         }
diff --git a/app/src/quickstart/java/org/thoughtcrime/securesms/QuickstartRestoreActivity.kt b/app/src/quickstart/java/org/thoughtcrime/securesms/QuickstartRestoreActivity.kt
index 92328e5314..9b4d3728d7 100644
--- a/app/src/quickstart/java/org/thoughtcrime/securesms/QuickstartRestoreActivity.kt
+++ b/app/src/quickstart/java/org/thoughtcrime/securesms/QuickstartRestoreActivity.kt
@@ -132,7 +132,7 @@ class QuickstartRestoreActivity : BaseActivity() {
     lifecycleScope.launch(Dispatchers.IO) {
       try {
         val self = Recipient.self()
-        val selfData = BackupRepository.SelfData(self.aci.get(), self.pni.get(), self.e164.get(), ProfileKey(self.profileKey))
+        val selfData = BackupRepository.SelfData(self.aci.get(), self.pni.orElse(null), self.e164.orElse(null), ProfileKey(self.profileKey))
 
         val backupDir = QuickstartInitializer.pendingBackupDir!!
 
diff --git a/app/src/spinner/java/org/thoughtcrime/securesms/BackupPlugin.kt b/app/src/spinner/java/org/thoughtcrime/securesms/BackupPlugin.kt
index 53f065bad9..ea8a7fefe2 100644
--- a/app/src/spinner/java/org/thoughtcrime/securesms/BackupPlugin.kt
+++ b/app/src/spinner/java/org/thoughtcrime/securesms/BackupPlugin.kt
@@ -82,7 +82,7 @@ class BackupPlugin : Plugin {
     }
 
     val self = Recipient.self()
-    val selfData = BackupRepository.SelfData(self.aci.get(), self.pni.get(), self.e164.get(), ProfileKey(self.profileKey))
+    val selfData = BackupRepository.SelfData(self.aci.get(), self.pni.orElse(null), self.e164.orElse(null), ProfileKey(self.profileKey))
 
     val backupKey = SignalStore.backup.messageBackupKey
 
@@ -116,7 +116,7 @@ class BackupPlugin : Plugin {
     val snapshotFS = SnapshotFileSystem(AppDependencies.application, snapshot.file)
 
     val self = Recipient.self()
-    val selfData = BackupRepository.SelfData(self.aci.get(), self.pni.get(), self.e164.get(), ProfileKey(self.profileKey))
+    val selfData = BackupRepository.SelfData(self.aci.get(), self.pni.orElse(null), self.e164.orElse(null), ProfileKey(self.profileKey))
 
     val backupKey = SignalStore.backup.messageBackupKey