diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0a640eb1..8f7d45997 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 2018-10-24
+
+## Disabling riot-web guests
+
+From now on, Riot's configuration setting `disable_guests` would be set to `true`.
+The homeserver was rejecting guests anyway, so this is just a cosmetic change affecting Riot's UI.
+
+
 # 2018-10-21
 
 ## Self-check maintenance command
diff --git a/docs/configuring-playbook-matrix-corporal.md b/docs/configuring-playbook-matrix-corporal.md
index 5dae201af..8e78ee933 100644
--- a/docs/configuring-playbook-matrix-corporal.md
+++ b/docs/configuring-playbook-matrix-corporal.md
@@ -39,6 +39,7 @@ No matter what Matrix user id you configure to run it with, make sure that:
 
 - the Matrix Corporal user is joined and has Admin/Moderator-level access to any rooms you want it to manage
 
+
 ## Matrix Corporal files
 
 The following local filesystem paths are mounted in the `matrix-corporal` container and can be used in your configuration (or policy):
diff --git a/roles/matrix-server/templates/riot-web/config.json.j2 b/roles/matrix-server/templates/riot-web/config.json.j2
index ffc356dd5..37d62f8d2 100644
--- a/roles/matrix-server/templates/riot-web/config.json.j2
+++ b/roles/matrix-server/templates/riot-web/config.json.j2
@@ -2,7 +2,7 @@
     "default_hs_url": "{{ matrix_homeserver_url }}",
     "default_is_url": "{{ matrix_identity_server_url }}",
     "disable_custom_urls": true,
-    "disable_guests": false,
+    "disable_guests": true,
     "brand": "Riot",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",