diff --git a/roles/matrix-prometheus-node-exporter/tasks/validate_config.yml b/roles/matrix-prometheus-node-exporter/tasks/validate_config.yml
deleted file mode 100644
index 713646ae..00000000
--- a/roles/matrix-prometheus-node-exporter/tasks/validate_config.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-
-- name: Fail if Synapse metrics or Prometheus Node Exporter not enabled
-  fail:
-    msg: >
-      You need to enable `matrix_synapse_metrics_enabled` and/or `matrix_prometheus_node_exporter_enabled` for Prometheus grab metrics.
-  when: "not matrix_synapse_metrics_enabled and not matrix_prometheus_node_exporter_enabled"
diff --git a/roles/matrix-prometheus/tasks/main.yml b/roles/matrix-prometheus/tasks/main.yml
index edb01988..20f18cc3 100644
--- a/roles/matrix-prometheus/tasks/main.yml
+++ b/roles/matrix-prometheus/tasks/main.yml
@@ -3,7 +3,7 @@
     - always
 
 - import_tasks: "{{ role_path }}/tasks/validate_config.yml"
-  when: run_setup|bool
+  when: "run_setup|bool and matrix_prometheus_enabled|bool"
   tags:
     - setup-all
     - setup-prometheus