diff --git a/roles/matrix-server/tasks/setup/setup_synapse_main.yml b/roles/matrix-server/tasks/setup/setup_synapse_main.yml
index e36b417af..6264abce4 100644
--- a/roles/matrix-server/tasks/setup/setup_synapse_main.yml
+++ b/roles/matrix-server/tasks/setup/setup_synapse_main.yml
@@ -1,10 +1,5 @@
 ---
 
-- name: Fail if Macaroon key is missing
-  fail:
-    msg: "You need to set a secret in the matrix_synapse_macaroon_secret_key variable"
-  when: "matrix_synapse_macaroon_secret_key == ''"
-
 # This will throw a Permission Denied error if already mounted using fuse
 - name: Check Matrix Synapse media store path
   stat: path="{{ matrix_synapse_media_store_path }}"
diff --git a/roles/matrix-server/tasks/setup/setup_synapse_pre.yml b/roles/matrix-server/tasks/setup/setup_synapse_pre.yml
index 77fa51a1d..8e8adca39 100644
--- a/roles/matrix-server/tasks/setup/setup_synapse_pre.yml
+++ b/roles/matrix-server/tasks/setup/setup_synapse_pre.yml
@@ -1,5 +1,10 @@
 ---
 
+- name: Fail if Macaroon key is missing
+  fail:
+    msg: "You need to set a secret in the matrix_synapse_macaroon_secret_key variable"
+  when: "matrix_synapse_macaroon_secret_key == ''"
+
 - name: Ensure Matrix Synapse paths exist
   file:
     path: "{{ item }}"