diff --git a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
index 13efcfa89..0ae380dd0 100644
--- a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
+++ b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
@@ -107,7 +107,7 @@ class LinphoneUtils {
         fun isEndToEndEncryptedChatAvailable(): Boolean {
             val core = coreContext.core
             return core.isLimeX3DhEnabled &&
-                core.defaultAccount?.params?.limeServerUrl != null &&
+                (core.limeX3DhServerUrl != null || core.defaultAccount?.params?.limeServerUrl != null) &&
                 core.defaultAccount?.params?.conferenceFactoryUri != null
         }