diff --git a/playbooks/manual/upgrade/bodhi.yml b/playbooks/manual/upgrade/bodhi.yml
index aef2df17e6..1701646863 100644
--- a/playbooks/manual/upgrade/bodhi.yml
+++ b/playbooks/manual/upgrade/bodhi.yml
@@ -12,6 +12,12 @@
     shell: "curl https://bodhi{{env_suffix}}.fedoraproject.org/composes/"
     register: composes
 
+  - name: Fail if we found that a mash was in progress
+    fail:
+      msg: "There are composes in progress."
+    any_errors_fatal: true
+    when: "composes.stdout != '{\"composes\": []}' and env != 'staging'"
+
 - name: push packages out
   hosts: bodhi_backend:bodhi_backend_stg
   user: root