diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 742a56d6c..9da9c3a05 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -826,7 +826,7 @@ devture_systemd_service_manager_services_list_auto: |
       'priority': 800,
       'restart_necessary': true,
       'groups': ['matrix', 'goofys'],
-    }] if matrix_s3_media_store_enabled else [])
+    }] if (matrix_synapse_enabled and matrix_s3_media_store_enabled) else [])
     +
     ([{
       'name': 'matrix-synapse-s3-storage-provider-migrate.timer',