diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
index 2c359be05..60569f339 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
@@ -319,13 +319,10 @@ class ContactViewModel
         contact.postValue(ContactAvatarModel(friend))
 
         val organization = friend.organization
-        if (!organization.isNullOrEmpty()) {
-            company.postValue(organization!!)
-        }
+        company.postValue(organization.orEmpty())
+
         val jobTitle = friend.jobTitle
-        if (!jobTitle.isNullOrEmpty()) {
-            title.postValue(jobTitle!!)
-        }
+        title.postValue(jobTitle.orEmpty())
 
         val addressesAndNumbers = friend.getListOfSipAddressesAndPhoneNumbers(listener)
         sipAddressesAndPhoneNumbers.postValue(addressesAndNumbers)