diff --git a/app/src/main/java/org/linphone/LinphoneManager.java b/app/src/main/java/org/linphone/LinphoneManager.java
index 2d6111d75..0963b22c8 100644
--- a/app/src/main/java/org/linphone/LinphoneManager.java
+++ b/app/src/main/java/org/linphone/LinphoneManager.java
@@ -754,26 +754,25 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
         // Migrate existing linphone accounts to have conference factory uri and LIME X3Dh url set
         String uri = getString(R.string.default_conference_factory_uri);
         for (ProxyConfig lpc : mCore.getProxyConfigList()) {
-            if (lpc.getConferenceFactoryUri() == null
-                    && lpc.getIdentityAddress()
-                            .getDomain()
-                            .equals(getString(R.string.default_domain))) {
-                lpc.edit();
-                Log.i(
-                        "[Manager] Setting conference factory on proxy config "
-                                + lpc.getIdentityAddress().asString()
-                                + " to default value: "
-                                + uri);
-                lpc.setConferenceFactoryUri(uri);
-                lpc.done();
-            }
+            if (lpc.getIdentityAddress().getDomain().equals(getString(R.string.default_domain))) {
+                if (lpc.getConferenceFactoryUri() == null) {
+                    lpc.edit();
+                    Log.i(
+                            "[Manager] Setting conference factory on proxy config "
+                                    + lpc.getIdentityAddress().asString()
+                                    + " to default value: "
+                                    + uri);
+                    lpc.setConferenceFactoryUri(uri);
+                    lpc.done();
+                }
 
-            if (mCore.limeX3DhAvailable()) {
-                String url = mCore.getLimeX3DhServerUrl();
-                if (url == null || url.length() == 0) {
-                    url = getString(R.string.default_lime_x3dh_server_url);
-                    Log.i("[Manager] Setting LIME X3Dh server url to default value: " + url);
-                    mCore.setLimeX3DhServerUrl(url);
+                if (mCore.limeX3DhAvailable()) {
+                    String url = mCore.getLimeX3DhServerUrl();
+                    if (url == null || url.length() == 0) {
+                        url = getString(R.string.default_lime_x3dh_server_url);
+                        Log.i("[Manager] Setting LIME X3Dh server url to default value: " + url);
+                        mCore.setLimeX3DhServerUrl(url);
+                    }
                 }
             }
         }