diff --git a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactEditorViewModel.kt b/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactEditorViewModel.kt
index 4881bbbba..619a87b47 100644
--- a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactEditorViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactEditorViewModel.kt
@@ -211,8 +211,8 @@ class ContactEditorViewModel(val c: Friend?) : ViewModel(), ContactDataInterface
 
     private fun updateNumbersAndAddresses() {
         val phoneNumbers = arrayListOf<NumberOrAddressEditorData>()
-        for (number in c?.phoneNumbersWithLabel.orEmpty()) {
-            phoneNumbers.add(NumberOrAddressEditorData(number.phoneNumber, false))
+        for (number in c?.phoneNumbers.orEmpty()) {
+            phoneNumbers.add(NumberOrAddressEditorData(number, false))
         }
         if (phoneNumbers.isEmpty()) {
             phoneNumbers.add(NumberOrAddressEditorData("", false))
diff --git a/app/src/main/java/org/linphone/contact/ContactsManager.kt b/app/src/main/java/org/linphone/contact/ContactsManager.kt
index 73e0ad5a6..860eed764 100644
--- a/app/src/main/java/org/linphone/contact/ContactsManager.kt
+++ b/app/src/main/java/org/linphone/contact/ContactsManager.kt
@@ -291,8 +291,8 @@ class ContactsManager(private val context: Context) {
     }
 
     private fun storePresenceInNativeContact(friend: Friend) {
-        for (phoneNumber in friend.phoneNumbersWithLabel) {
-            val sipAddress = friend.getContactForPhoneNumberOrAddress(phoneNumber.phoneNumber)
+        for (phoneNumber in friend.phoneNumbers) {
+            val sipAddress = friend.getContactForPhoneNumberOrAddress(phoneNumber)
             if (sipAddress != null) {
                 Log.d("[Contacts Manager] Found presence information to store in native contact $friend under Linphone sync account")
                 val contactEditor = NativeContactEditor(friend)
@@ -301,7 +301,7 @@ class ContactsManager(private val context: Context) {
                     val deferred = async {
                         withContext(Dispatchers.IO) {
                             contactEditor.setPresenceInformation(
-                                phoneNumber.phoneNumber,
+                                phoneNumber,
                                 sipAddress
                             ).commit()
                         }
@@ -347,8 +347,8 @@ fun Friend.hasPresence(): Boolean {
         val presenceModel = getPresenceModelForUriOrTel(address.asStringUriOnly())
         if (presenceModel != null && presenceModel.basicStatus == PresenceBasicStatus.Open) return true
     }
-    for (number in phoneNumbersWithLabel) {
-        val presenceModel = getPresenceModelForUriOrTel(number.phoneNumber)
+    for (number in phoneNumbers) {
+        val presenceModel = getPresenceModelForUriOrTel(number)
         if (presenceModel != null && presenceModel.basicStatus == PresenceBasicStatus.Open) return true
     }
     return false