diff --git a/roles/matrix-synapse/vars/workers.yml b/roles/matrix-synapse/vars/workers.yml
index f1dfb940..33bf585b 100644
--- a/roles/matrix-synapse/vars/workers.yml
+++ b/roles/matrix-synapse/vars/workers.yml
@@ -75,19 +75,23 @@ matrix_synapse_workers_generic_worker_endpoints:
   - ^/_matrix/client/(api/v1|r0|v3|unstable)/join/
   - ^/_matrix/client/(api/v1|r0|v3|unstable)/profile/
 
-  # Device requests
-  - ^/_matrix/client/(r0|v3|unstable)/sendToDevice/
+  # These appear to be conditional and should not be enabled by default.
+  # We need to fix up our workers-doc-to-yaml.awk parsing script to exclude them.
+  # For now, they've been commented out manually.
+  #
+  # # Device requests
+  # - ^/_matrix/client/(r0|v3|unstable)/sendToDevice/
 
-  # Account data requests
-  - ^/_matrix/client/(r0|v3|unstable)/.*/tags
-  - ^/_matrix/client/(r0|v3|unstable)/.*/account_data
+  # # Account data requests
+  # - ^/_matrix/client/(r0|v3|unstable)/.*/tags
+  # - ^/_matrix/client/(r0|v3|unstable)/.*/account_data
 
-  # Receipts requests
-  - ^/_matrix/client/(r0|v3|unstable)/rooms/.*/receipt
-  - ^/_matrix/client/(r0|v3|unstable)/rooms/.*/read_markers
+  # # Receipts requests
+  # - ^/_matrix/client/(r0|v3|unstable)/rooms/.*/receipt
+  # - ^/_matrix/client/(r0|v3|unstable)/rooms/.*/read_markers
 
-  # Presence requests
-  - ^/_matrix/client/(api/v1|r0|v3|unstable)/presence/
+  # # Presence requests
+  # - ^/_matrix/client/(api/v1|r0|v3|unstable)/presence/
 
 
   # Additionally, the following REST endpoints can be handled for GET requests: