diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index 444049314..68b6fcc3b 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -453,10 +453,16 @@ class CoreContext(
                     Log.i("[Context] CPIM allowed in basic chat rooms for account ${params.identityAddress?.asString()}")
                 }
 
-                if (account.params.limeServerUrl == null && limeServerUrl.isNotEmpty()) {
-                    params.limeServerUrl = limeServerUrl
-                    paramsChanged = true
-                    Log.i("[Context] Moving Core's LIME X3DH server URL [$limeServerUrl] on account ${params.identityAddress?.asString()}")
+                if (account.params.limeServerUrl.isNullOrEmpty()) {
+                    if (limeServerUrl.isNotEmpty()) {
+                        params.limeServerUrl = limeServerUrl
+                        paramsChanged = true
+                        Log.i("[Context] Moving Core's LIME X3DH server URL [$limeServerUrl] on account ${params.identityAddress?.asString()}")
+                    } else {
+                        params.limeServerUrl = corePreferences.limeServerUrl
+                        paramsChanged = true
+                        Log.w("[Context] Linphone account [${params.identityAddress?.asString()}] didn't have a LIME X3DH server URL, setting one: ${corePreferences.limeServerUrl}")
+                    }
                 }
 
                 if (paramsChanged) {
diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt
index c74dd76d3..f82c97cf8 100644
--- a/app/src/main/java/org/linphone/core/CorePreferences.kt
+++ b/app/src/main/java/org/linphone/core/CorePreferences.kt
@@ -522,6 +522,13 @@ class CorePreferences constructor(private val context: Context) {
             "sip:videoconference-factory@sip.linphone.org"
         )!!
 
+    val limeServerUrl: String
+        get() = config.getString(
+            "app",
+            "default_lime_server_url",
+            "https://lime.linphone.org/lime-server/lime-server.php"
+        )!!
+
     val checkUpdateAvailableInterval: Int
         get() = config.getInt("app", "version_check_interval", 86400000)