diff --git a/dist/functions/server/web-pages/grab-page-component.js b/dist/functions/server/web-pages/grab-page-component.js
index de0f772..b8a599c 100644
--- a/dist/functions/server/web-pages/grab-page-component.js
+++ b/dist/functions/server/web-pages/grab-page-component.js
@@ -131,8 +131,6 @@ export default async function grabPageComponent(params) {
                     await serverPostBuildFn();
                     return component_retried;
                 }
-                global.BUNEXT_PAGES_SRC_WATCHER?.close();
-                watcherEsbuildCTX();
             }
             global.BUNEXT_REBUILD_RETRIES = 0;
         }
@@ -142,8 +140,7 @@ export default async function grabPageComponent(params) {
         else {
             log.error(`Error Grabbing Page Component: ${error.message}`);
             log.error(`Page: ${passed_file_path || url?.pathname}`);
-            global.BUNEXT_PAGES_SRC_WATCHER?.close();
-            watcherEsbuildCTX();
+            fullRebuild();
         }
         return await grabPageErrorComponent({
             error,
diff --git a/dist/functions/server/web-pages/grab-page-error-component.js b/dist/functions/server/web-pages/grab-page-error-component.js
index 2b5a339..a83f9b6 100644
--- a/dist/functions/server/web-pages/grab-page-error-component.js
+++ b/dist/functions/server/web-pages/grab-page-error-component.js
@@ -2,6 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import grabDirNames from "../../../utils/grab-dir-names";
 import grabPageModules from "./grab-page-modules";
 import _ from "lodash";
+import fullRebuild from "../full-rebuild";
 export default async function grabPageErrorComponent({ error, routeParams, is404, url, }) {
     const router = global.BUNEXT_ROUTER;
     const { BUNX_ROOT_500_PRESET_COMPONENT, BUNX_ROOT_404_PRESET_COMPONENT } = grabDirNames();
@@ -51,6 +52,7 @@ export default async function grabPageErrorComponent({ error, routeParams, is404
         };
     }
     catch {
+        fullRebuild();
         const DefaultNotFound = () => (_jsxs("div", { style: {
                 width: "100vw",
                 height: "100vh",
diff --git a/package.json b/package.json
index f1b5c54..14fa364 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/bunext",
-    "version": "1.1.5",
+    "version": "1.1.6",
     "main": "dist/index.js",
     "module": "index.ts",
     "dependencies": {
diff --git a/src/functions/server/web-pages/grab-page-component.tsx b/src/functions/server/web-pages/grab-page-component.tsx
index 3c98d51..a4ffbf6 100644
--- a/src/functions/server/web-pages/grab-page-component.tsx
+++ b/src/functions/server/web-pages/grab-page-component.tsx
@@ -188,9 +188,6 @@ export default async function grabPageComponent(
                     await serverPostBuildFn();
                     return component_retried;
                 }
-
-                global.BUNEXT_PAGES_SRC_WATCHER?.close();
-                watcherEsbuildCTX();
             }
 
             global.BUNEXT_REBUILD_RETRIES = 0;
@@ -202,8 +199,7 @@ export default async function grabPageComponent(
             log.error(`Error Grabbing Page Component: ${error.message}`);
             log.error(`Page: ${passed_file_path || url?.pathname}`);
 
-            global.BUNEXT_PAGES_SRC_WATCHER?.close();
-            watcherEsbuildCTX();
+            fullRebuild();
         }
 
         return await grabPageErrorComponent({
diff --git a/src/functions/server/web-pages/grab-page-error-component.tsx b/src/functions/server/web-pages/grab-page-error-component.tsx
index acfdedf..74830c9 100644
--- a/src/functions/server/web-pages/grab-page-error-component.tsx
+++ b/src/functions/server/web-pages/grab-page-error-component.tsx
@@ -7,6 +7,7 @@ import type {
 } from "../../../types";
 import grabPageModules from "./grab-page-modules";
 import _ from "lodash";
+import fullRebuild from "../full-rebuild";
 
 type Params = {
     error?: any;
@@ -83,6 +84,8 @@ export default async function grabPageErrorComponent({
             root_module,
         };
     } catch {
+        fullRebuild();
+
         const DefaultNotFound: FC = () => (
             <div
                 style={{