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 414461525..71796e3fb 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
@@ -47,7 +47,6 @@ import org.linphone.ui.main.contacts.model.ContactAvatarModel
 import org.linphone.ui.main.contacts.model.ContactDeviceModel
 import org.linphone.ui.main.contacts.model.ContactNumberOrAddressClickListener
 import org.linphone.ui.main.contacts.model.ContactNumberOrAddressModel
-import org.linphone.ui.main.model.isEndToEndEncryptionMandatory
 import org.linphone.utils.AppUtils
 import org.linphone.utils.Event
 import org.linphone.utils.FileUtils
@@ -259,14 +258,11 @@ class ContactViewModel
             chatDisabled.postValue(corePreferences.disableChat)
             videoCallDisabled.postValue(!core.isVideoEnabled)
 
+            val defaultDomain = LinphoneUtils.getDefaultAccount()?.params?.domain == corePreferences.defaultDomain
             // Only show contact's devices for Linphone accounts
-            showContactTrustAndDevices.postValue(
-                LinphoneUtils.getDefaultAccount()?.params?.domain == corePreferences.defaultDomain
-            )
-            // Only expand contacts' devices & trust by default if in E2E encrypted mode
-            expandDevicesTrust.postValue(
-                isEndToEndEncryptionMandatory()
-            )
+            showContactTrustAndDevices.postValue(defaultDomain)
+
+            expandDevicesTrust.postValue(defaultDomain)
             coreContext.contactsManager.addListener(contactsListener)
         }
     }
@@ -643,6 +639,9 @@ class ContactViewModel
                 } else {
                     trustedDevicesPercentageFloat.postValue(percentage / 100f / 2)
                 }
+                if (percentage == 100) {
+                    expandDevicesTrust.postValue(false)
+                }
             }
         }
 
diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml
index 903ade065..98a38352b 100644
--- a/app/src/main/res/layout/contact_fragment.xml
+++ b/app/src/main/res/layout/contact_fragment.xml
@@ -102,8 +102,8 @@
                     <androidx.constraintlayout.widget.Group
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:constraint_referenced_ids="trusted_devices_count, trusted_devices_progress, devices, trusted_devices_progress_label"
-                        android:visibility="@{viewModel.showContactTrustAndDevices ? (viewModel.expandDevicesTrust &amp;&amp; viewModel.devices.size() > 0 ? View.VISIBLE : View.GONE) : View.GONE}" />
+                        app:constraint_referenced_ids="trusted_devices_count, trusted_devices_progress, devices, trusted_devices_progress_label, trusted_devices_progress_background"
+                        android:visibility="@{viewModel.showContactTrustAndDevices ? (viewModel.expandDevicesTrust &amp;&amp; viewModel.devices.size() > 0 ? View.VISIBLE : View.GONE) : View.GONE, default=gone}" />
 
                     <include
                         android:id="@+id/avatar"