diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPhoneViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPhoneViewModel.kt
index bfc4c0e10..d39083158 100644
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPhoneViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPhoneViewModel.kt
@@ -20,9 +20,7 @@
 
 package org.linphone.activities.assistant.viewmodels
 
-import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
 import org.linphone.activities.assistant.fragments.CountryPickerFragment
 import org.linphone.core.AccountCreator
@@ -39,9 +37,7 @@ abstract class AbstractPhoneViewModel(val accountCreator: AccountCreator) :
     val phoneNumber = MutableLiveData<String>()
     val phoneNumberError = MutableLiveData<String>()
 
-    val countryName: LiveData<String> = Transformations.switchMap(prefix) {
-        getCountryNameFromPrefix(it)
-    }
+    val countryName = MutableLiveData<String>()
 
     init {
         prefix.value = "+"
@@ -49,6 +45,7 @@ abstract class AbstractPhoneViewModel(val accountCreator: AccountCreator) :
 
     override fun onCountryClicked(dialPlan: DialPlan) {
         prefix.value = "+${dialPlan.countryCallingCode}"
+        countryName.value = dialPlan.country
     }
 
     fun isPhoneNumberOk(): Boolean {