diff --git a/roles/custom/matrix-synapse/tasks/main.yml b/roles/custom/matrix-synapse/tasks/main.yml
index 743dab5fe..2a8a00942 100644
--- a/roles/custom/matrix-synapse/tasks/main.yml
+++ b/roles/custom/matrix-synapse/tasks/main.yml
@@ -36,8 +36,8 @@
     - setup-all
     - setup-synapse
   block:
-    - when: not matrix_synapse_enabled | bool
-      ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
+    # This always runs because it handles uninstallation for sub-components too.
+    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
 
 - tags:
     - import-synapse-media-store
diff --git a/roles/custom/matrix-synapse/tasks/setup_uninstall.yml b/roles/custom/matrix-synapse/tasks/setup_uninstall.yml
index 7ce5e13dd..66cda3e7d 100644
--- a/roles/custom/matrix-synapse/tasks/setup_uninstall.yml
+++ b/roles/custom/matrix-synapse/tasks/setup_uninstall.yml
@@ -4,7 +4,8 @@
     - setup-all
     - setup-synapse
   block:
-    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/setup_uninstall.yml"
+    - when: not matrix_synapse_enabled | bool
+      ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/setup_uninstall.yml"
 
 - tags:
     - setup-all
@@ -17,7 +18,8 @@
     - setup-all
     - setup-synapse
   block:
-    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/synapse/setup_uninstall.yml"
+    - when: not matrix_synapse_enabled | bool
+      ansible.builtin.include_tasks: "{{ role_path }}/tasks/synapse/setup_uninstall.yml"
 
 - tags:
     - setup-all