diff --git a/nix/host-modules/swarm-bao.nix b/nix/host-modules/swarm-bao.nix
index a12d1c79..b7726500 100644
--- a/nix/host-modules/swarm-bao.nix
+++ b/nix/host-modules/swarm-bao.nix
@@ -1190,6 +1190,14 @@ let
   privateNetwork = false;
 in
 {
+  imports = [
+    (lib.mkRemovedOptionModule [ "services" "hyperhive" "deploy" "bao" "matrixCtlHiveName" ] ''
+      swarm-controller is the only minter of the per-hive matrix sender token,
+      and this option named a write grant matrix-ctl no longer holds. Delete
+      this setting.
+    '')
+  ];
+
   # One service, two namespaces, and the split decides who may set what.
   #
   # `deploy.bao.*` is mostly what the host RUNNING the store decides: whether