diff --git a/roles/matrix-server/templates/riot-web/config.json.j2 b/roles/matrix-server/templates/riot-web/config.json.j2
index 6f300b4d..ea2fed53 100644
--- a/roles/matrix-server/templates/riot-web/config.json.j2
+++ b/roles/matrix-server/templates/riot-web/config.json.j2
@@ -1,6 +1,8 @@
 {
     "default_hs_url": "https://{{ hostname_matrix }}",
     "default_is_url": "https://vector.im",
+    "disable_custom_urls": true,
+    "disable_guests": false,
     "brand": "Riot",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",