diff --git a/app/build.gradle b/app/build.gradle
index 44e9bd8b1..a7679fced 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -210,11 +210,11 @@ dependencies {
     implementation "androidx.security:security-crypto-ktx:1.1.0-alpha06"
     implementation "androidx.window:window:1.1.0"
 
-    def emoji_version = "1.4.0-rc01"
+    def emoji_version = "1.4.0"
     implementation "androidx.emoji2:emoji2:$emoji_version"
     implementation "androidx.emoji2:emoji2-emojipicker:$emoji_version"
 
-    def nav_version = "2.6.0"
+    def nav_version = "2.7.1"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
index 75db99224..e7bd08092 100644
--- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
@@ -598,14 +598,16 @@ fun addPrefixEditTextValidation(editText: EditText, enabled: Boolean) {
     if (!enabled) return
     editText.addTextChangedListener(object : TextWatcher {
         override fun afterTextChanged(s: Editable?) {
-            val dialPlan = PhoneNumberUtils.getDialPlanFromCountryCallingPrefix(
-                s.toString().substring(1)
-            )
-            if (dialPlan == null) {
-                editText.error =
-                    editText.context.getString(
-                        R.string.assistant_error_invalid_international_prefix
-                    )
+            if ((s?.length ?: 0) > 1) {
+                val dialPlan = PhoneNumberUtils.getDialPlanFromCountryCallingPrefix(
+                    s.toString().substring(1)
+                )
+                if (dialPlan == null) {
+                    editText.error =
+                        editText.context.getString(
+                            R.string.assistant_error_invalid_international_prefix
+                        )
+                }
             }
         }
 
@@ -861,7 +863,9 @@ fun ScrollDotsView.setSelectedIndex(index: Int) {
 }
 
 @BindingAdapter("presenceIcon")
-fun ImageView.setPresenceIcon(presence: ConsolidatedPresence) {
+fun ImageView.setPresenceIcon(presence: ConsolidatedPresence?) {
+    if (presence == null) return
+
     val icon = when (presence) {
         ConsolidatedPresence.Online -> R.drawable.led_online
         ConsolidatedPresence.DoNotDisturb -> R.drawable.led_do_not_disturb