diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditActionsController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditActionsController.php
index fe2e2f818b..a112650371 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditActionsController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditActionsController.php
@@ -75,7 +75,8 @@ final class DiffusionRepositoryEditActionsController
           "Normally, Phabricator publishes notifications when it discovers ".
           "new commits. You can disable publishing for this repository by ".
           "turning off **Notify/Publish**. This will disable notifications, ".
-          "feed, and Herald for this repository.".
+          "feed, and Herald (including audits and build plans) for this ".
+          "repository.".
           "\n\n".
           "When Phabricator discovers a new commit, it can automatically ".
           "close associated revisions and tasks. If you don't want ".
diff --git a/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php b/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
index 7c7ac2d0de..cdf4087196 100644
--- a/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
+++ b/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
@@ -33,6 +33,10 @@ final class PhabricatorRepositoryCommitHeraldWorker
       return;
     }
 
+    if ($repository->getDetail('herald-disabled')) {
+      return;
+    }
+
     $data = id(new PhabricatorRepositoryCommitData())->loadOneWhere(
       'commitID = %d',
       $commit->getID());
@@ -75,11 +79,6 @@ final class PhabricatorRepositoryCommitHeraldWorker
 
     $explicit_auditors = $this->createAuditsFromCommitMessage($commit, $data);
 
-    if ($repository->getDetail('herald-disabled')) {
-      // This just means "disable email"; audits are (mostly) idempotent.
-      return;
-    }
-
     $this->publishFeedStory($repository, $commit, $data);
 
     $herald_targets = $adapter->getEmailPHIDs();
diff --git a/src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php b/src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php
index 71fa47fb30..e6b8630776 100644
--- a/src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php
+++ b/src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php
@@ -7,6 +7,10 @@ final class PhabricatorRepositoryCommitOwnersWorker
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit) {
 
+    if ($repository->getDetail('herald-disabled')) {
+      return;
+    }
+
     $affected_paths = PhabricatorOwnerPathQuery::loadAffectedPaths(
       $repository,
       $commit,