diff --git a/package-lock.json b/package-lock.json
index 0cdf05860..5ee3db1ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -117,7 +117,7 @@
         "prettier": "^3.5.3",
         "prettier-plugin-sql": "^0.19.0",
         "prettier-plugin-tailwindcss": "^0.6.11",
-        "react-router-devtools": "^5.0.1",
+        "react-router-devtools": "^5.0.4",
         "remix-flat-routes": "^0.8.5",
         "tsx": "^4.19.4",
         "tw-animate-css": "^1.2.9",
@@ -15956,9 +15956,9 @@
       }
     },
     "node_modules/react-router-devtools": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/react-router-devtools/-/react-router-devtools-5.0.1.tgz",
-      "integrity": "sha512-WHxixi3kIfc7zN0mKdftnluwriPLvtlDP8gxPU4w19FWB5I3yKuHxFimpHJjNDm+uapSY8Cwf8fhISAxu/QlOg==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/react-router-devtools/-/react-router-devtools-5.0.4.tgz",
+      "integrity": "sha512-iTWKNOOPZYMH6pYCoPc0aOFu0F5uVHc//Ugo90SRFqajPf4GRM5jFvrlmvNvxC98yp3ceJDit6Hargml9JpLtA==",
       "dev": true,
       "license": "MIT",
       "workspaces": [
diff --git a/package.json b/package.json
index 107ab726d..2afcdf4eb 100644
--- a/package.json
+++ b/package.json
@@ -148,7 +148,7 @@
     "prettier": "^3.5.3",
     "prettier-plugin-sql": "^0.19.0",
     "prettier-plugin-tailwindcss": "^0.6.11",
-    "react-router-devtools": "^5.0.1",
+    "react-router-devtools": "^5.0.4",
     "remix-flat-routes": "^0.8.5",
     "tsx": "^4.19.4",
     "tw-animate-css": "^1.2.9",
@@ -164,4 +164,4 @@
     "seed": "tsx prisma/seed.ts"
   },
   "prettier": "@epic-web/config/prettier"
-}
+}
\ No newline at end of file
diff --git a/server/index.ts b/server/index.ts
index dd5dc8790..b55f22cf1 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -25,7 +25,12 @@ const viteDevServer = IS_PROD
 	? undefined
 	: await import('vite').then((vite) =>
 			vite.createServer({
-				server: { middlewareMode: true },
+				server: {
+					middlewareMode: true,
+				},
+				// We tell Vite we are running a custom app instead of 
+				// the SPA default so it doesn't run HTML middleware
+				appType: 'custom',
 			}),
 		)
 
diff --git a/tests/mocks/index.ts b/tests/mocks/index.ts
index 5158a53c8..ea52c807f 100644
--- a/tests/mocks/index.ts
+++ b/tests/mocks/index.ts
@@ -21,6 +21,10 @@ server.listen({
 		if (request.url.includes('.sentry.io')) {
 			return
 		}
+		// React-router-devtools send custom requests internally to handle some functionality, we ignore those
+		if (request.url.includes('react-router-devtools-request')) {
+			return
+		}
 		// Print the regular MSW unhandled request warning otherwise.
 		print.warning()
 	},