diff --git a/docs/configuring-well-known.md b/docs/configuring-well-known.md
index f9f086b0..53a35386 100644
--- a/docs/configuring-well-known.md
+++ b/docs/configuring-well-known.md
@@ -46,6 +46,10 @@ The two playbook variables that you could look for, if you're interested in bein
 
 Example snippet for `vars.yml`:
 ```
+# Enable generation of `/.well-known/matrix/support`.
+# This needs to be enabled explicitly for now, because MSC 1929 is not yet accepted.
+matrix_well_known_matrix_support_enabled: true
+
 # Homeserver admin contacts as per MSC 1929 https://github.com/matrix-org/matrix-spec-proposals/pull/1929
 matrix_homeserver_admin_contacts:
   - matrix_id: "@admin1:{{ matrix_domain }}"
diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index 6095f730..a0c0da9b 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -271,8 +271,10 @@ matrix_well_known_matrix_server_enabled: true
 
 # Controls whether a `/.well-known/matrix/support` file is generated and used at all.
 #
+# This is not enabled by default, until the MSC gets accepted: https://github.com/matrix-org/matrix-spec-proposals/pull/1929
+#
 # See `matrix_homeserver_admin_contacts`, `matrix_homeserver_support_url`, etc.
-matrix_well_known_matrix_support_enabled: true
+matrix_well_known_matrix_support_enabled: false
 
 # Controls whether Docker is automatically installed.
 # If you change this to false you must install and update Docker manually. You also need to install the docker (https://pypi.org/project/docker/) Python package.