diff --git a/src/Eleventy.js b/src/Eleventy.js
index 308e48fd3..cffbee278 100644
--- a/src/Eleventy.js
+++ b/src/Eleventy.js
@@ -1072,6 +1072,8 @@ Arguments:
 		benchmark.before();
 		await this.#initWatchDependencies();
 		benchmark.after();
+
+		eventBus.on("eleventyDevServer.rebuild", async () => await this._watch());
 	}
 
 	// fetch from project’s package.json
diff --git a/src/EleventyServe.js b/src/EleventyServe.js
index 4676d19fb..47b55d4ed 100644
--- a/src/EleventyServe.js
+++ b/src/EleventyServe.js
@@ -4,6 +4,7 @@ import debugUtil from "debug";
 import { Merge, DeepCopy, TemplatePath } from "@11ty/eleventy-utils";
 
 import EleventyBaseError from "./Errors/EleventyBaseError.js";
+import EventBus from "./EventBus.js";
 import ConsoleLogger from "./Util/ConsoleLogger.js";
 import PathPrefixer from "./Util/PathPrefixer.js";
 import checkPassthroughCopyBehavior from "./Util/PassthroughCopyBehaviorCheck.js";
@@ -181,6 +182,10 @@ class EleventyServe {
 		// Static method `getServer` was already checked in `getServerModule`
 		this._server = serverModule.getServer("eleventy-server", this.outputDir, this.options);
 
+    if ("setEventBus" in this._server) {
+      this._server.setEventBus(EventBus);
+    }
+
 		this.setAliases(this._aliases);
 
 		if (this._globsNeedWatching) {