diff --git a/playbooks/groups/mbs.yml b/playbooks/groups/mbs.yml
index 87f0c97b2a..e2cc3c41a5 100644
--- a/playbooks/groups/mbs.yml
+++ b/playbooks/groups/mbs.yml
@@ -92,6 +92,18 @@
   roles:
   - mbs/frontend
 
+  post_tasks:
+  # Shouldn't be necessary after this change makes it out
+  # https://src.fedoraproject.org/rpms/module-build-service/c/d19515a7c053aa90cddccd5e10a5615b773a7bd2
+  - name: Make sure fedmsg-hub isn't running on the frontend.
+    service:
+      name: fedmsg-hub
+      state: stopped
+      enabled: false
+    tags:
+    - mbs
+    - mbs/frontend
+
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
 
diff --git a/playbooks/manual/upgrade/mbs.yml b/playbooks/manual/upgrade/mbs.yml
index 68cda885d2..40707d03b2 100644
--- a/playbooks/manual/upgrade/mbs.yml
+++ b/playbooks/manual/upgrade/mbs.yml
@@ -128,6 +128,13 @@
 
   tasks:
   - service: name="httpd" state=started
+  # Shouldn't be necessary after this change makes it out
+  # https://src.fedoraproject.org/rpms/module-build-service/c/d19515a7c053aa90cddccd5e10a5615b773a7bd2
+  - name: Make sure fedmsg-hub isn't running on the frontend.
+    service:
+      name: fedmsg-hub
+      state: stopped
+      enabled: false
 
   post_tasks:
   - name: tell nagios to unshush w.r.t. the frontend