diff --git a/biome.json b/biome.json
index f89818139..5b3843b4e 100644
--- a/biome.json
+++ b/biome.json
@@ -18,7 +18,7 @@
       "frontend/src/gql/**",
       "frontend/src/routeTree.gen.ts",
       "frontend/.storybook/locales.ts",
-      "frontend/.storybook/mockServiceWorker.js",
+      "frontend/.storybook/public/mockServiceWorker.js",
       "frontend/locales/*.json",
       "**/coverage/**",
       "**/dist/**"
diff --git a/frontend/.storybook/main.ts b/frontend/.storybook/main.ts
index f09d9e6c3..73a06d8c2 100644
--- a/frontend/.storybook/main.ts
+++ b/frontend/.storybook/main.ts
@@ -57,9 +57,8 @@ const config: StorybookConfig = {
   },
 
   viteFinal: async (config) => {
-    // Host all the assets in the root directory,
-    // so that the service worker is correctly scoped to the root
-    config.build.assetsDir = "";
+    // Serve the storybook-specific assets, which has the service worker
+    config.publicDir = ".storybook/public";
     return config;
   },
 };
diff --git a/frontend/.storybook/preview.tsx b/frontend/.storybook/preview.tsx
index b4b4a7a58..268849ffa 100644
--- a/frontend/.storybook/preview.tsx
+++ b/frontend/.storybook/preview.tsx
@@ -18,13 +18,12 @@ import i18n, { setupI18n } from "../src/i18n";
 import { DummyRouter } from "../src/test-utils/router";
 import { handlers } from "../tests/mocks/handlers";
 import localazyMetadata from "./locales";
-import swUrl from "./mockServiceWorker.js?url";
 
 initialize(
   {
     onUnhandledRequest: "bypass",
     serviceWorker: {
-      url: swUrl,
+      url: "./mockServiceWorker.js",
     },
   },
   handlers,
diff --git a/frontend/.storybook/mockServiceWorker.js b/frontend/.storybook/public/mockServiceWorker.js
similarity index 100%
rename from frontend/.storybook/mockServiceWorker.js
rename to frontend/.storybook/public/mockServiceWorker.js
diff --git a/frontend/package.json b/frontend/package.json
index 0b11b2bfc..24cc784b5 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -88,7 +88,7 @@
     "vitest": "^2.1.8"
   },
   "msw": {
-    "workerDirectory": [".storybook"]
+    "workerDirectory": [".storybook/public"]
   },
   "overrides": {
     "swagger-ui-react": {