diff --git a/app/src/main/java/org/linphone/contact/ContactDataInterface.kt b/app/src/main/java/org/linphone/contact/ContactDataInterface.kt
index 5bf254462..90171dd7c 100644
--- a/app/src/main/java/org/linphone/contact/ContactDataInterface.kt
+++ b/app/src/main/java/org/linphone/contact/ContactDataInterface.kt
@@ -60,7 +60,9 @@ open class GenericContactData(private val sipAddress: Address) : ContactDataInte
         displayName.value = LinphoneUtils.getDisplayName(sipAddress)
 
         val c = coreContext.contactsManager.findContactByAddress(sipAddress)
-        contact.value = c
+        if (c != null) {
+            contact.value = c!!
+        }
     }
 }
 
diff --git a/app/src/main/java/org/linphone/contact/ContactSelectionData.kt b/app/src/main/java/org/linphone/contact/ContactSelectionData.kt
index 83e3e96d0..73ba13cae 100644
--- a/app/src/main/java/org/linphone/contact/ContactSelectionData.kt
+++ b/app/src/main/java/org/linphone/contact/ContactSelectionData.kt
@@ -63,7 +63,7 @@ class ContactSelectionData(private val searchResult: SearchResult) : ContactData
     private fun searchMatchingContact() {
         val friend = searchResult.friend
         if (friend != null) {
-            contact.value = friend
+            contact.value = friend!!
             displayName.value = friend.name
         } else {
             val address = searchResult.address