diff --git a/roles/custom/matrix-user-verification-service/tasks/main.yml b/roles/custom/matrix-user-verification-service/tasks/main.yml
index 92686036..6eaaaf23 100644
--- a/roles/custom/matrix-user-verification-service/tasks/main.yml
+++ b/roles/custom/matrix-user-verification-service/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
 - block:
-    - when: matrix_jitsi_enabled | bool
+    - when: run_setup | bool and matrix_user_verification_service_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml"
     - when: run_setup | bool and matrix_user_verification_service_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"