diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml
index dffe6178a..ecf1d976e 100644
--- a/roles/custom/matrix-synapse/defaults/main.yml
+++ b/roles/custom/matrix-synapse/defaults/main.yml
@@ -952,12 +952,6 @@ matrix_synapse_default_room_version: "10"
 # The upstream default is `false`, but we try to make Synapse less wasteful of resources, so we do things differently.
 matrix_synapse_forget_rooms_on_leave: true
 
-# Controls the Synapse `spam_checker` setting.
-#
-# If a spam-checker extension is enabled, this variable's value is set automatically by the playbook during runtime.
-# If not, you can also control its value manually.
-matrix_synapse_spam_checker: []
-
 # Controls the Synapse `modules` list.
 # You can define your own list of modules here. See the `modules` syntax in `homeserver.yaml.j2`
 # Certain Synapse extensions that you can enable below auto-inject themselves into `matrix_synapse_modules` at runtime.
diff --git a/roles/custom/matrix-synapse/tasks/validate_config.yml b/roles/custom/matrix-synapse/tasks/validate_config.yml
index 607c75b8c..64397a493 100644
--- a/roles/custom/matrix-synapse/tasks/validate_config.yml
+++ b/roles/custom/matrix-synapse/tasks/validate_config.yml
@@ -66,7 +66,7 @@
     - {'old': 'matrix_synapse_ext_s3_storage_provider_path', 'new': 'matrix_synapse_ext_s3_storage_provider_base_path'}
     - {'old': 'matrix_synapse_send_federation', 'new': '<unnecessary - Synapse relies on federation_sender_instances now>'}
     - {'old': 'matrix_synapse_start_pushers', 'new': '<unnecessary - Synapse relies on pusher_instances now>'}
-
+    - {'old': 'matrix_synapse_spam_checker', 'new': '<superseded by matrix_synapse_modules>'}
 
 - name: (Deprecation) Catch and report renamed settings in matrix_synapse_configuration_extension_yaml
   ansible.builtin.fail:
diff --git a/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
index e12bdb194..7b1c1dfd1 100644
--- a/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
+++ b/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
@@ -2570,20 +2570,6 @@ push:
   #group_unread_count_by_room: false
 
 
-# Spam checkers are third-party modules that can block specific actions
-# of local users, such as creating rooms and registering undesirable
-# usernames, as well as remote users by redacting incoming events.
-#
-# spam_checker:
-   #- module: "my_custom_project.SuperSpamChecker"
-   #  config:
-   #    example_option: 'things'
-   #- module: "some_other_project.BadEventStopper"
-   #  config:
-   #    example_stop_events_from: ['@bad:example.com']
-spam_checker: {{ matrix_synapse_spam_checker|to_json }}
-
-
 ## Rooms ##
 
 # Controls whether locally-created rooms should be end-to-end encrypted by