diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphone.kt b/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphone.kt
index 03b10a94b2..9693525974 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphone.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphone.kt
@@ -68,6 +68,7 @@ fun OnboardingMegaphone(
 ) {
   Column(
     modifier = modifier
+      .background(MaterialTheme.colorScheme.background)
       .padding(bottom = 22.dp)
   ) {
     Box(
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 30c23e247c..9d13eceb75 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
@@ -143,6 +143,7 @@ class RestoreLocalBackupActivityViewModel : ViewModel() {
           Log.w(TAG, "Local backup does not match current account, not re-enabling local backups")
         }
 
+        SignalStore.onboarding.clearAll()
         StorageServiceRestore.restore()
         RegistrationUtil.maybeMarkRegistrationComplete()