diff --git a/.changeset/silent-hairs-fold.md b/.changeset/silent-hairs-fold.md
new file mode 100644
index 000000000000..9f5828284ecf
--- /dev/null
+++ b/.changeset/silent-hairs-fold.md
@@ -0,0 +1,23 @@
+---
+"@cloudflare/vite-plugin": minor
+"@cloudflare/chrome-devtools-patches": patch
+"@cloudflare/devprod-status-bot": patch
+"@cloudflare/edge-preview-authenticated-proxy": patch
+"@cloudflare/eslint-config-shared": patch
+"@cloudflare/format-errors": patch
+"@cloudflare/kv-asset-handler": patch
+"@cloudflare/mock-npm-registry": patch
+"@cloudflare/playground-preview-worker": patch
+"@cloudflare/quick-edit": patch
+"@cloudflare/quick-edit-extension": patch
+"solarflare-theme": patch
+"@cloudflare/turbo-r2-archive": patch
+"@cloudflare/unenv-preset": patch
+"@vite-plugin-cloudflare/playground": patch
+"@cloudflare/workers-editor-shared": patch
+"@cloudflare/workers-playground": patch
+"@cloudflare/workers-shared": patch
+"@cloudflare/workers-tsconfig": patch
+---
+
+Moved miniflare dispose inside server.restart() instead of in the buildEnd()
diff --git a/packages/vite-plugin-cloudflare/src/index.ts b/packages/vite-plugin-cloudflare/src/index.ts
index 8f7b248495a8..3afe871c6694 100644
--- a/packages/vite-plugin-cloudflare/src/index.ts
+++ b/packages/vite-plugin-cloudflare/src/index.ts
@@ -189,6 +189,14 @@ export function cloudflare(pluginConfig: PluginConfig = {}): vite.Plugin[] {
 					try {
 						restartingServer = true;
 						debuglog("From server.restart(): Restarting server...");
+						debuglog("From server.restart(): disposing Miniflare instance");
+						await miniflare?.dispose().catch((error) => {
+							debuglog(
+								"From server.restart(): failed to dispose Miniflare instance:",
+								error
+							);
+						});
+						miniflare = undefined;
 						await restartServer();
 						debuglog("From server.restart(): Restarted server...");
 					} finally {
@@ -466,13 +474,6 @@ export function cloudflare(pluginConfig: PluginConfig = {}): vite.Plugin[] {
 				}
 
 				debuglog("buildEnd:", restartingServer ? "restarted" : "disposing");
-				if (!restartingServer) {
-					debuglog("buildEnd: disposing Miniflare instance");
-					await miniflare?.dispose().catch((error) => {
-						debuglog("buildEnd: failed to dispose Miniflare instance:", error);
-					});
-					miniflare = undefined;
-				}
 			},
 		},
 		// Plugin that provides a `__debug` path for debugging the Workers