diff --git a/element.io/app/config.json b/element.io/app/config.json
index 0ecec414c4..a549322c67 100644
--- a/element.io/app/config.json
+++ b/element.io/app/config.json
@@ -1,5 +1,13 @@
 {
     "default_server_name": "matrix.org",
+    "default_server_config": {
+        "m.homeserver": {
+            "base_url": "https://matrix-client.matrix.org"
+        },
+        "m.identity_server": {
+            "base_url": "https://vector.im"
+        }
+    },
     "brand": "Element",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
diff --git a/element.io/develop/config.json b/element.io/develop/config.json
index e5c3f22e71..43e7e36357 100644
--- a/element.io/develop/config.json
+++ b/element.io/develop/config.json
@@ -1,5 +1,13 @@
 {
     "default_server_name": "matrix.org",
+    "default_server_config": {
+        "m.homeserver": {
+            "base_url": "https://matrix-client.matrix.org"
+        },
+        "m.identity_server": {
+            "base_url": "https://vector.im"
+        }
+    },
     "brand": "Element",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",