diff --git a/roles/custom/matrix-user-creator/tasks/setup.yml b/roles/custom/matrix-user-creator/tasks/setup.yml
index d63177736..55e1dedef 100644
--- a/roles/custom/matrix-user-creator/tasks/setup.yml
+++ b/roles/custom/matrix-user-creator/tasks/setup.yml
@@ -31,7 +31,7 @@
       # Suppress logging to avoid dumping the credentials to the shell
       no_log: true
 
-- when: matrix_authentication_service_enabled | bool
+- when: matrix_authentication_service_enabled and not matrix_authentication_service_migration_in_progress
   block:
     - name: Ensure Matrix Authentication Service is started before creating Matrix users
       ansible.builtin.service: