diff --git a/ops/machines/whitby/default.nix b/ops/machines/whitby/default.nix
index a7f3392be..d341ed0ce 100644
--- a/ops/machines/whitby/default.nix
+++ b/ops/machines/whitby/default.nix
@@ -429,7 +429,8 @@ in
     };
 
     # Run autosubmit bot for Gerrit
-    gerrit-queue.enable = true;
+    # b/333: disabled for now because of bugs
+    gerrit-queue.enable = false;
   };
 
   services.postgresql = {