diff --git a/extension.json b/extension.json
index 431081336..2280db198 100644
--- a/extension.json
+++ b/extension.json
@@ -15,7 +15,7 @@
 	"license-name": "MIT",
 	"type": "specialpage",
 	"requires": {
-		"MediaWiki": ">= 1.40.0"
+		"MediaWiki": ">= 1.41.0"
 	},
 	"APIMetaModules": {
 		"notifications": {
diff --git a/includes/Controller/NotificationController.php b/includes/Controller/NotificationController.php
index 6b4064330..554f9ac9c 100644
--- a/includes/Controller/NotificationController.php
+++ b/includes/Controller/NotificationController.php
@@ -12,6 +12,7 @@ use EchoServices;
 use InvalidArgumentException;
 use Iterator;
 use MapCacheLRU;
+use MediaWiki\Extension\Notifications\Hooks\HookRunner;
 use MediaWiki\Extension\Notifications\Iterator\FilteredSequentialIterator;
 use MediaWiki\Extension\Notifications\Jobs\NotificationDeleteJob;
 use MediaWiki\Extension\Notifications\Jobs\NotificationJob;
@@ -128,7 +129,7 @@ class NotificationController {
 		$userIds = [];
 		$userIdsCount = 0;
 		$services = MediaWikiServices::getInstance();
-		$hookContainer = $services->getHookContainer();
+		$hookRunner = new HookRunner( $services->getHookContainer() );
 		$userOptionsLookup = $services->getUserOptionsLookup();
 		/** @var bool|null $hasMinorRevision */
 		$hasMinorRevision = null;
@@ -147,7 +148,7 @@ class NotificationController {
 					$userNotifyTypes = array_diff( $userNotifyTypes, [ 'email' ] );
 				}
 			}
-			$hookContainer->run( 'EchoGetNotificationTypes', [ $user, $event, &$userNotifyTypes ] );
+			$hookRunner->onEchoGetNotificationTypes( $user, $event, $userNotifyTypes );
 
 			// types such as web, email, etc
 			foreach ( $userNotifyTypes as $type ) {
@@ -489,8 +490,8 @@ class NotificationController {
 		// Hook for injecting more users.
 		// @deprecated
 		$users = [];
-		MediaWikiServices::getInstance()->getHookContainer()->run( 'EchoGetDefaultNotifiedUsers', [ $event, &$users ] );
-		// @phan-suppress-next-line PhanImpossibleCondition May be set by hook
+		( new HookRunner( MediaWikiServices::getInstance()->getHookContainer() ) )
+			->onEchoGetDefaultNotifiedUsers( $event, $users );
 		if ( $users ) {
 			$notify->add( $users );
 		}
diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index 0bd7a402b..b0c2133f1 100644
--- a/includes/DiscussionParser.php
+++ b/includes/DiscussionParser.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Extension\Notifications\Hooks\HookRunner;
 use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\RevisionRecord;
@@ -177,7 +178,8 @@ abstract class EchoDiscussionParser {
 
 		// Allow extensions to generate more events for a revision, and de-duplicate
 		// against the standard events created above.
-		$services->getHookContainer()->run( 'EchoGetEventsForRevision', [ &$events, $revision, $isRevert ] );
+		( new HookRunner( $services->getHookContainer() ) )
+			->onEchoGetEventsForRevision( $events, $revision, $isRevert );
 
 		// Create events
 		foreach ( $events as $event ) {
diff --git a/includes/Hooks.php b/includes/Hooks.php
index b4bc6db95..c91a54203 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -26,6 +26,7 @@ use MediaWiki\DAO\WikiAwareEntity;
 use MediaWiki\Extension\Notifications\Controller\ModerationController;
 use MediaWiki\Extension\Notifications\Controller\NotificationController;
 use MediaWiki\Extension\Notifications\Formatters\EchoEventPresentationModel;
+use MediaWiki\Extension\Notifications\Hooks\HookRunner;
 use MediaWiki\Extension\Notifications\Mapper\EventMapper;
 use MediaWiki\Extension\Notifications\Mapper\NotificationMapper;
 use MediaWiki\Extension\Notifications\Model\Event;
@@ -197,8 +198,8 @@ class Hooks implements
 			$wgEnableUserEmail;
 
 		// allow extensions to define their own event
-		MediaWikiServices::getInstance()->getHookContainer()->run( 'BeforeCreateEchoEvent',
-			[ &$wgEchoNotifications, &$wgEchoNotificationCategories, &$wgEchoNotificationIcons ] );
+		( new HookRunner( MediaWikiServices::getInstance()->getHookContainer() ) )->onBeforeCreateEchoEvent(
+			$wgEchoNotifications, $wgEchoNotificationCategories, $wgEchoNotificationIcons );
 
 		// Only allow mention status notifications when enabled
 		if ( !$wgEchoMentionStatusNotifications ) {
@@ -644,7 +645,7 @@ class Hooks implements
 
 	/**
 	 * Handler for EchoAbortEmailNotification hook
-	 * @param User $user
+	 * @param UserIdentity $user
 	 * @param Event $event
 	 * @return bool true - send email, false - do not send email
 	 */
@@ -1090,8 +1091,8 @@ class Hooks implements
 		if (
 			$mytalk &&
 			self::shouldDisplayTalkAlert( $user, $title ) &&
-			MediaWikiServices::getInstance()
-				->getHookContainer()->run( 'BeforeDisplayOrangeAlert', [ $user, $title ] )
+			( new HookRunner( MediaWikiServices::getInstance()
+				->getHookContainer() ) )->onBeforeDisplayOrangeAlert( $user, $title )
 		) {
 			// Create new talk alert inheriting from the talk link data.
 			$links['notifications']['talk-alert'] = array_merge(
@@ -1263,7 +1264,8 @@ class Hooks implements
 		// notifications for talk page messages, disable the new messages alert.
 		if ( $user->isRegistered()
 			&& isset( $wgEchoNotifications['edit-user-talk'] )
-			&& MediaWikiServices::getInstance()->getHookContainer()->run( 'EchoCanAbortNewMessagesAlert' )
+			&& ( new HookRunner( MediaWikiServices::getInstance()->getHookContainer() ) )
+				->onEchoCanAbortNewMessagesAlert()
 		) {
 			// hide new messages alert
 			return false;
diff --git a/includes/Hooks/BeforeCreateEchoEventHook.php b/includes/Hooks/BeforeCreateEchoEventHook.php
new file mode 100644
index 000000000..fd2619404
--- /dev/null
+++ b/includes/Hooks/BeforeCreateEchoEventHook.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace MediaWiki\Extension\Notifications\Hooks;
+
+/**
+ * This is a hook handler interface, see docs/Hooks.md in core.
+ * Use the hook name "BeforeCreateEchoEvent" to register handlers implementing this interface.
+ *
+ * @stable to implement
+ * @ingroup Hooks
+ */
+interface BeforeCreateEchoEventHook {
+	/**
+	 * Called on setup of Echo extension
+	 *
+	 * @param array &$notifications To expand $wgEchoNnotifications
+	 * @param array &$notificationCategories To expand $wgEchoNotificationCategories
+	 * @param array &$notificationIcons To expand $wgEchoNotificationIcons
+	 * @return bool|void True or no return value to continue or false to abort
+	 */
+	public function onBeforeCreateEchoEvent(
+		array &$notifications,
+		array &$notificationCategories,
+		array &$notificationIcons
+	);
+}
diff --git a/includes/Hooks/BeforeDisplayOrangeAlertHook.php b/includes/Hooks/BeforeDisplayOrangeAlertHook.php
new file mode 100644
index 000000000..7826989be
--- /dev/null
+++ b/includes/Hooks/BeforeDisplayOrangeAlertHook.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace MediaWiki\Extension\Notifications\Hooks;
+
+use MediaWiki\Title\Title;
+use User;
+
+/**
+ * This is a hook handler interface, see docs/Hooks.md in core.
+ * Use the hook name "BeforeDisplayOrangeAlert" to register handlers implementing this interface.
+ *
+ * @stable to implement
+ * @ingroup Hooks
+ */
+interface BeforeDisplayOrangeAlertHook {
+	/**
+	 * @param User $user
+	 * @param Title $title
+	 * @return bool|void True or no return value to continue or false to abort
+	 */
+	public function onBeforeDisplayOrangeAlert( User $user, Title $title );
+}
diff --git a/includes/Hooks/BeforeEchoEventInsertHook.php b/includes/Hooks/BeforeEchoEventInsertHook.php
new file mode 100644
index 000000000..f5437f43d
--- /dev/null
+++ b/includes/Hooks/BeforeEchoEventInsertHook.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace MediaWiki\Extension\Notifications\Hooks;
+
+use MediaWiki\Extension\Notifications\Model\Event;
+
+/**
+ * This is a hook handler interface, see docs/Hooks.md in core.
+ * Use the hook name "BeforeEchoEventInsert" to register handlers implementing this interface.
+ *
+ * @stable to implement
+ * @ingroup Hooks
+ */
+interface BeforeEchoEventInsertHook {
+	/**
+	 * @param Event $event
+	 * @return bool|void True or no return value to continue or false to abort
+	 */
+	public function onBeforeEchoEventInsert( Event $event );
+}
diff --git a/includes/Hooks/EchoAbortEmailNotificationHook.php b/includes/Hooks/EchoAbortEmailNotificationHook.php
new file mode 100644
index 000000000..de6c67fc4
--- /dev/null
+++ b/includes/Hooks/EchoAbortEmailNotificationHook.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace MediaWiki\Extension\Notifications\Hooks;
+
+use MediaWiki\Extension\Notifications\Model\Event;
+use MediaWiki\User\UserIdentity;
+
+/**
+ * This is a hook handler interface, see docs/Hooks.md in core.
+ * Use the hook name "EchoAbortEmailNotification" to register handlers implementing this interface.
+ *
+ * @stable to implement
+ * @ingroup Hooks
+ */
+interface EchoAbortEmailNotificationHook {
+	/**
+	 * @param UserIdentity $user
+	 * @param Event $event
+	 * @return bool|void True or no return value to continue or false to abort
+	 */
+	public function onEchoAbortEmailNotification( UserIdentity $user, Event $event );
+}
diff --git a/includes/Hooks/EchoCanAbortNewMessagesAlertHook.php b/includes/Hooks/EchoCanAbortNewMessagesAlertHook.php
new file mode 100644
index 000000000..e8d6b2810
--- /dev/null
+++ b/includes/Hooks/EchoCanAbortNewMessagesAlertHook.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace MediaWiki\Extension\Notifications\Hooks;
+
+/**
+ * This is a hook handler interface, see docs/Hooks.md in core.
+ * Use the hook name "EchoCanAbortNewMessagesAlert" to register handlers implementing this interface.
+ *
+ * @stable to implement
+ * @ingroup Hooks
+ */
+interface EchoCanAbortNewMessagesAlertHook {
+	/**
+	 * @return bool|void True or no return value to continue or false to abort
+	 */
+	public function onEchoCanAbortNewMessagesAlert();
+}
diff --git a/includes/Hooks/EchoCreateNotificationCompleteHook.php b/includes/Hooks/EchoCreateNotificationCompleteHook.php
new file mode 100644
index 000000000..f1ea99814
--- /dev/null
+++ b/includes/Hooks/EchoCreateNotificationCompleteHook.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace MediaWiki\Extension\Notifications\Hooks;
+
+use MediaWiki\Extension\Notifications\Model\Notification;
+
+/**
+ * This is a hook handler interface, see docs/Hooks.md in core.
+ * Use the hook name "EchoCreateNotificationComplete" to register handlers implementing this interface.
+ *
+ * @stable to implement
+ * @ingroup Hooks
+ */
+interface EchoCreateNotificationCompleteHook {
+	/**
+	 * @param Notification $notification
+	 * @return bool|void True or no return value to continue or false to abort
+	 */
+	public function onEchoCreateNotificationComplete( Notification $notification );
+}
diff --git a/includes/Hooks/EchoGetBundleRulesHook.php b/includes/Hooks/EchoGetBundleRulesHook.php
new file mode 100644
index 000000000..3d5029548
--- /dev/null
+++ b/includes/Hooks/EchoGetBundleRulesHook.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace MediaWiki\Extension\Notifications\Hooks;
+
+use MediaWiki\Extension\Notifications\Model\Event;
+
+/**
+ * This is a hook handler interface, see docs/Hooks.md in core.
+ * Use the hook name "EchoGetBundleRules" to register handlers implementing this interface.
+ *
+ * @stable to implement
+ * @ingroup Hooks
+ */
+interface EchoGetBundleRulesHook {
+	/**
+	 * @param Event $event
+	 * @param string &$bundleKey
+	 * @return bool|void True or no return value to continue or false to abort
+	 */
+	public function onEchoGetBundleRules( Event $event, string &$bundleKey );
+}
diff --git a/includes/Hooks/EchoGetDefaultNotifiedUsersHook.php b/includes/Hooks/EchoGetDefaultNotifiedUsersHook.php
new file mode 100644
index 000000000..ec3209375
--- /dev/null
+++ b/includes/Hooks/EchoGetDefaultNotifiedUsersHook.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace MediaWiki\Extension\Notifications\Hooks;
+
+use MediaWiki\Extension\Notifications\Model\Event;
+use User;
+
+/**
+ * This is a hook handler interface, see docs/Hooks.md in core.
+ * Use the hook name "EchoGetDefaultNotifiedUsers" to register handlers implementing this interface.
+ *
+ * @stable to implement
+ * @ingroup Hooks
+ */
+interface EchoGetDefaultNotifiedUsersHook {
+	/**
+	 * @param Event $event
+	 * @param User[] &$users
+	 * @return bool|void True or no return value to continue or false to abort
+	 */
+	public function onEchoGetDefaultNotifiedUsers( Event $event, array &$users );
+}
diff --git a/includes/Hooks/EchoGetEventsForRevisionHook.php b/includes/Hooks/EchoGetEventsForRevisionHook.php
new file mode 100644
index 000000000..5ea506119
--- /dev/null
+++ b/includes/Hooks/EchoGetEventsForRevisionHook.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace MediaWiki\Extension\Notifications\Hooks;
+
+use MediaWiki\Revision\RevisionRecord;
+
+/**
+ * This is a hook handler interface, see docs/Hooks.md in core.
+ * Use the hook name "EchoGetEventsForRevision" to register handlers implementing this interface.
+ *
+ * @stable to implement
+ * @ingroup Hooks
+ */
+interface EchoGetEventsForRevisionHook {
+	/**
+	 * @param array &$events List of event info arrays
+	 * @param RevisionRecord $revision
+	 * @param bool $isRevert
+	 * @return bool|void True or no return value to continue or false to abort
+	 */
+	public function onEchoGetEventsForRevision( array &$events, RevisionRecord $revision, bool $isRevert );
+}
diff --git a/includes/Hooks/EchoGetNotificationTypesHook.php b/includes/Hooks/EchoGetNotificationTypesHook.php
new file mode 100644
index 000000000..60c1e2912
--- /dev/null
+++ b/includes/Hooks/EchoGetNotificationTypesHook.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace MediaWiki\Extension\Notifications\Hooks;
+
+use MediaWiki\Extension\Notifications\Model\Event;
+use User;
+
+/**
+ * This is a hook handler interface, see docs/Hooks.md in core.
+ * Use the hook name "EchoGetNotificationTypes" to register handlers implementing this interface.
+ *
+ * @stable to implement
+ * @ingroup Hooks
+ */
+interface EchoGetNotificationTypesHook {
+	/**
+	 * @param User $user
+	 * @param Event $event
+	 * @param string[] &$userNotifyTypes
+	 * @return bool|void True or no return value to continue or false to abort
+	 */
+	public function onEchoGetNotificationTypes( User $user, Event $event, array &$userNotifyTypes );
+}
diff --git a/includes/Hooks/EventInsertCompleteHook.php b/includes/Hooks/EventInsertCompleteHook.php
new file mode 100644
index 000000000..913f2bfdf
--- /dev/null
+++ b/includes/Hooks/EventInsertCompleteHook.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace MediaWiki\Extension\Notifications\Hooks;
+
+use MediaWiki\Extension\Notifications\Model\Event;
+
+/**
+ * This is a hook handler interface, see docs/Hooks.md in core.
+ * Use the hook name "EventInsertComplete" to register handlers implementing this interface.
+ *
+ * @stable to implement
+ * @ingroup Hooks
+ */
+interface EventInsertCompleteHook {
+	/**
+	 * @param Event $event
+	 * @return bool|void True or no return value to continue or false to abort
+	 */
+	public function onEventInsertComplete( Event $event );
+}
diff --git a/includes/Hooks/HookRunner.php b/includes/Hooks/HookRunner.php
new file mode 100644
index 000000000..f256d6ef4
--- /dev/null
+++ b/includes/Hooks/HookRunner.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace MediaWiki\Extension\Notifications\Hooks;
+
+use MediaWiki\Extension\Notifications\Model\Event;
+use MediaWiki\Extension\Notifications\Model\Notification;
+use MediaWiki\HookContainer\HookContainer;
+use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Title\Title;
+use MediaWiki\User\UserIdentity;
+use User;
+
+/**
+ * This is a hook runner class, see docs/Hooks.md in core.
+ * @internal
+ */
+class HookRunner implements
+	BeforeCreateEchoEventHook,
+	BeforeDisplayOrangeAlertHook,
+	BeforeEchoEventInsertHook,
+	EchoAbortEmailNotificationHook,
+	EchoCanAbortNewMessagesAlertHook,
+	EchoCreateNotificationCompleteHook,
+	EchoGetBundleRulesHook,
+	EchoGetDefaultNotifiedUsersHook,
+	EchoGetEventsForRevisionHook,
+	EchoGetNotificationTypesHook,
+	EventInsertCompleteHook
+{
+	private HookContainer $hookContainer;
+
+	public function __construct( HookContainer $hookContainer ) {
+		$this->hookContainer = $hookContainer;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function onBeforeCreateEchoEvent(
+		array &$notifications,
+		array &$notificationCategories,
+		array &$notificationIcons
+	) {
+		return $this->hookContainer->run(
+			'BeforeCreateEchoEvent',
+			[ &$notifications, &$notificationCategories, &$notificationIcons ]
+		);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function onBeforeDisplayOrangeAlert( User $user, Title $title ) {
+		return $this->hookContainer->run(
+			'BeforeDisplayOrangeAlert',
+			[ $user, $title ]
+		);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function onBeforeEchoEventInsert( Event $event ) {
+		return $this->hookContainer->run(
+			'BeforeEchoEventInsert',
+			[ $event ]
+		);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function onEchoAbortEmailNotification( UserIdentity $user, Event $event ) {
+		return $this->hookContainer->run(
+			'EchoAbortEmailNotification',
+			[ $user, $event ]
+		);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function onEchoCanAbortNewMessagesAlert() {
+		return $this->hookContainer->run(
+			'EchoCanAbortNewMessagesAlert'
+		);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function onEchoCreateNotificationComplete( Notification $notification ) {
+		return $this->hookContainer->run(
+			'EchoCreateNotificationComplete',
+			[ $notification ]
+		);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function onEchoGetBundleRules( Event $event, string &$bundleKey ) {
+		return $this->hookContainer->run(
+			'EchoGetBundleRules',
+			[ $event, &$bundleKey ]
+		);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function onEchoGetDefaultNotifiedUsers( Event $event, array &$users ) {
+		return $this->hookContainer->run(
+			'EchoGetDefaultNotifiedUsers',
+			[ $event, &$users ]
+		);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function onEchoGetEventsForRevision( array &$events, RevisionRecord $revision, bool $isRevert ) {
+		return $this->hookContainer->run(
+			'EchoGetEventsForRevision',
+			[ &$events, $revision, $isRevert ]
+		);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function onEchoGetNotificationTypes( User $user, Event $event, array &$userNotifyTypes ) {
+		return $this->hookContainer->run(
+			'EchoGetNotificationTypes',
+			[ $user, $event, &$userNotifyTypes ]
+		);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function onEventInsertComplete( Event $event ) {
+		return $this->hookContainer->run(
+			'EventInsertComplete',
+			[ $event ]
+		);
+	}
+}
diff --git a/includes/Model/Event.php b/includes/Model/Event.php
index da43fd28c..020d987c1 100644
--- a/includes/Model/Event.php
+++ b/includes/Model/Event.php
@@ -7,6 +7,7 @@ use EchoServices;
 use Exception;
 use InvalidArgumentException;
 use MediaWiki\Extension\Notifications\Controller\NotificationController;
+use MediaWiki\Extension\Notifications\Hooks\HookRunner;
 use MediaWiki\Extension\Notifications\Mapper\EventMapper;
 use MediaWiki\Extension\Notifications\Mapper\TargetPageMapper;
 use MediaWiki\Logger\LoggerFactory;
@@ -190,15 +191,15 @@ class Event extends AbstractEntity implements Bundleable {
 			}
 		}
 
-		$hookContainer = $services->getHookContainer();
-		if ( !$hookContainer->run( 'BeforeEchoEventInsert', [ $obj ] ) ) {
+		$hookRunner = new HookRunner( $services->getHookContainer() );
+		if ( !$hookRunner->onBeforeEchoEventInsert( $obj ) ) {
 			return false;
 		}
 
 		// @Todo - Database insert logic should not be inside the model
 		$obj->insert();
 
-		$hookContainer->run( 'EventInsertComplete', [ $obj ] );
+		$hookRunner->onEventInsertComplete( $obj );
 
 		global $wgEchoUseJobQueue;
 
diff --git a/includes/Model/Notification.php b/includes/Model/Notification.php
index a167c3228..ca5c0ce43 100644
--- a/includes/Model/Notification.php
+++ b/includes/Model/Notification.php
@@ -4,6 +4,7 @@ namespace MediaWiki\Extension\Notifications\Model;
 
 use Bundleable;
 use InvalidArgumentException;
+use MediaWiki\Extension\Notifications\Hooks\HookRunner;
 use MediaWiki\Extension\Notifications\Mapper\NotificationMapper;
 use MediaWiki\MediaWikiServices;
 use MWEchoNotifUser;
@@ -106,14 +107,13 @@ class Notification extends AbstractEntity implements Bundleable {
 		$notifMapper = new NotificationMapper();
 
 		$services = MediaWikiServices::getInstance();
-		$hookContainer = $services->getHookContainer();
+		$hookRunner = new HookRunner( $services->getHookContainer() );
 		// Get the bundle key for this event if web bundling is enabled
 		$bundleKey = '';
 		if ( !empty( $wgEchoNotifications[$this->event->getType()]['bundle']['web'] ) ) {
-			$hookContainer->run( 'EchoGetBundleRules', [ $this->event, &$bundleKey ] );
+			$hookRunner->onEchoGetBundleRules( $this->event, $bundleKey );
 		}
 
-		// @phan-suppress-next-line PhanImpossibleCondition May be set by hook
 		if ( $bundleKey ) {
 			$hash = md5( $bundleKey );
 			$this->bundleHash = $hash;
@@ -134,7 +134,7 @@ class Notification extends AbstractEntity implements Bundleable {
 			$services->getTalkPageNotificationManager()
 				->setUserHasNewMessages( $this->user );
 		}
-		$hookContainer->run( 'EchoCreateNotificationComplete', [ $this ] );
+		$hookRunner->onEchoCreateNotificationComplete( $this );
 	}
 
 	/**
diff --git a/includes/Notifier.php b/includes/Notifier.php
index 3f53bda84..a410c8b95 100644
--- a/includes/Notifier.php
+++ b/includes/Notifier.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\Extension\Notifications\Formatters\EchoHtmlEmailFormatter;
 use MediaWiki\Extension\Notifications\Formatters\EchoPlainTextEmailFormatter;
+use MediaWiki\Extension\Notifications\Hooks\HookRunner;
 use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\Extension\Notifications\Model\Notification;
 use MediaWiki\MediaWikiServices;
@@ -52,9 +53,9 @@ class EchoNotifier {
 			return false;
 		}
 
-		$hookContainer = $services->getHookContainer();
+		$hookRunner = new HookRunner( $services->getHookContainer() );
 		// Final check on whether to send email for this user & event
-		if ( !$hookContainer->run( 'EchoAbortEmailNotification', [ $user, $event ] ) ) {
+		if ( !$hookRunner->onEchoAbortEmailNotification( $user, $event ) ) {
 			return false;
 		}
 
@@ -74,9 +75,8 @@ class EchoNotifier {
 			if ( !empty( $wgEchoNotifications[$event->getType()]['bundle']['web'] ) ||
 				!empty( $wgEchoNotifications[$event->getType()]['bundle']['email'] )
 			) {
-				$hookContainer->run( 'EchoGetBundleRules', [ $event, &$bundleString ] );
+				$hookRunner->onEchoGetBundleRules( $event, $bundleString );
 			}
-			// @phan-suppress-next-line PhanImpossibleCondition May be set by hook
 			if ( $bundleString ) {
 				$bundleHash = md5( $bundleString );
 			}
diff --git a/tests/phpunit/unit/HookRunnerTest.php b/tests/phpunit/unit/HookRunnerTest.php
new file mode 100644
index 000000000..db1b1d38a
--- /dev/null
+++ b/tests/phpunit/unit/HookRunnerTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace MediaWiki\Extension\Notifications\Tests\Unit;
+
+use MediaWiki\Extension\Notifications\Hooks\HookRunner;
+use MediaWiki\Tests\HookContainer\HookRunnerTestBase;
+
+/**
+ * @covers \MediaWiki\Extension\Notifications\Hooks\HookRunner
+ */
+class HookRunnerTest extends HookRunnerTestBase {
+
+	public static function provideHookRunners() {
+		yield HookRunner::class => [ HookRunner::class ];
+	}
+}