diff --git a/roles/matrix-base/tasks/main.yml b/roles/matrix-base/tasks/main.yml
index 26e019967..029e592e3 100644
--- a/roles/matrix-base/tasks/main.yml
+++ b/roles/matrix-base/tasks/main.yml
@@ -13,7 +13,9 @@
     - setup-all
 
 - import_tasks: "{{ role_path }}/tasks/server_base/setup.yml"
-  when: run_setup|bool
+  when:
+    - run_setup|bool
+    - not matrix_skip_setup_server_base|bool
   tags:
     - setup-all