diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
index b8c770e62..1ac9deb24 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
@@ -46,7 +46,9 @@ class AccountSettingsViewModelFactory(private val identity: String) :
         if (defaultAccount != null) {
             return AccountSettingsViewModel(defaultAccount) as T
         }
-        return coreContext.core.accountList.firstOrNull() as T
+
+        val firstAccount = coreContext.core.accountList.first()
+        return AccountSettingsViewModel(firstAccount) as T
     }
 }