diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt
index ff4a67628..2f23b4a5d 100644
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt
+++ b/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt
@@ -67,7 +67,9 @@ class AccountLoginFragment : AbstractPhoneFragment<AssistantAccountLoginFragment
         }
 
         binding.setSelectCountryClickListener {
-            CountryPickerFragment(viewModel).show(childFragmentManager, "CountryPicker")
+            val countryPickerFragment = CountryPickerFragment()
+            countryPickerFragment.listener = viewModel
+            countryPickerFragment.show(childFragmentManager, "CountryPicker")
         }
 
         binding.setForgotPasswordClickListener {
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/CountryPickerFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/CountryPickerFragment.kt
index e6245e25b..9f7f10024 100644
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/CountryPickerFragment.kt
+++ b/app/src/main/java/org/linphone/activities/assistant/fragments/CountryPickerFragment.kt
@@ -29,11 +29,13 @@ import org.linphone.activities.assistant.adapters.CountryPickerAdapter
 import org.linphone.core.DialPlan
 import org.linphone.databinding.AssistantCountryPickerFragmentBinding
 
-class CountryPickerFragment(private val listener: CountryPickedListener) : DialogFragment() {
+class CountryPickerFragment() : DialogFragment() {
     private var _binding: AssistantCountryPickerFragmentBinding? = null
     private val binding get() = _binding!!
     private lateinit var adapter: CountryPickerAdapter
 
+    var listener: CountryPickedListener? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NO_TITLE, R.style.assistant_country_dialog_style)
@@ -57,7 +59,7 @@ class CountryPickerFragment(private val listener: CountryPickedListener) : Dialo
         binding.countryList.setOnItemClickListener { _, _, position, _ ->
             if (position >= 0 && position < adapter.count) {
                 val dialPlan = adapter.getItem(position)
-                listener.onCountryClicked(dialPlan)
+                listener?.onCountryClicked(dialPlan)
             }
             dismiss()
         }
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountCreationFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountCreationFragment.kt
index 595846b36..005a8d8d1 100644
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountCreationFragment.kt
+++ b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountCreationFragment.kt
@@ -57,7 +57,9 @@ class PhoneAccountCreationFragment :
         }
 
         binding.setSelectCountryClickListener {
-            CountryPickerFragment(viewModel).show(childFragmentManager, "CountryPicker")
+            val countryPickerFragment = CountryPickerFragment()
+            countryPickerFragment.listener = viewModel
+            countryPickerFragment.show(childFragmentManager, "CountryPicker")
         }
 
         viewModel.goToSmsValidationEvent.observe(
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt
index 9ff9259e3..c543ebc94 100644
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt
+++ b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt
@@ -68,7 +68,9 @@ class PhoneAccountLinkingFragment : AbstractPhoneFragment<AssistantPhoneAccountL
         }
 
         binding.setSelectCountryClickListener {
-            CountryPickerFragment(viewModel).show(childFragmentManager, "CountryPicker")
+            val countryPickerFragment = CountryPickerFragment()
+            countryPickerFragment.listener = viewModel
+            countryPickerFragment.show(childFragmentManager, "CountryPicker")
         }
 
         viewModel.goToSmsValidationEvent.observe(