diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt
index 7ea351443..4bd7f8bf0 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt
@@ -122,13 +122,13 @@ class AccountSettings(
     var hasDonatedInVersion: MutableStateFlow<Set<String>> = MutableStateFlow(setOf<String>()),
     val pendingAttestations: MutableStateFlow<Map<HexKey, String>> = MutableStateFlow<Map<HexKey, String>>(mapOf()),
 ) {
-    val saveable = MutableStateFlow(AccountSettingsUpdater(this))
+    val saveable = MutableStateFlow(AccountSettingsUpdater(null))
     val syncedSettings: AccountSyncedSettings =
         backupSyncedSettings?.let { AccountSyncedSettings(it) }
             ?: AccountSyncedSettings(AccountSyncedSettingsInternal())
 
     class AccountSettingsUpdater(
-        val accountSettings: AccountSettings,
+        val accountSettings: AccountSettings?,
     )
 
     fun saveAccountSettings() {
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt
index 1cf963b1e..2ead1a8a3 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt
@@ -179,7 +179,9 @@ class AccountStateViewModel : ViewModel() {
         collectorJob =
             viewModelScope.launch(Dispatchers.IO) {
                 accountSettings.saveable.debounce(1000).collect {
-                    LocalPreferences.saveToEncryptedStorage(it.accountSettings)
+                    if (it.accountSettings != null) {
+                        LocalPreferences.saveToEncryptedStorage(it.accountSettings)
+                    }
                 }
             }
     }