diff --git a/next-ui/src/components/BuildCommit.stories.ts b/next-ui/src/components/BuildCommit.stories.ts
index f2509b1cf..be0637ec8 100644
--- a/next-ui/src/components/BuildCommit.stories.ts
+++ b/next-ui/src/components/BuildCommit.stories.ts
@@ -30,7 +30,7 @@ export const Default: Story = {
 export const Loading: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', async () => await delay(5_000))],
+      handlers: [http.all('*/actuator/info', async () => await delay(5_000))],
     },
   },
 }
@@ -38,7 +38,7 @@ export const Loading: Story = {
 export const Error: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', response401Unauthorized)],
+      handlers: [http.all('*/actuator/info', response401Unauthorized)],
     },
   },
 }
diff --git a/next-ui/src/components/BuildVersion.stories.ts b/next-ui/src/components/BuildVersion.stories.ts
index 820f7487d..37e05bb8b 100644
--- a/next-ui/src/components/BuildVersion.stories.ts
+++ b/next-ui/src/components/BuildVersion.stories.ts
@@ -43,7 +43,7 @@ export const OutdatedVersion: Story = {
 export const Loading: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', async () => await delay(5_000))],
+      handlers: [http.all('*/api/v1/releases', async () => await delay(5_000))],
     },
   },
 }
@@ -51,7 +51,7 @@ export const Loading: Story = {
 export const Error: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', response401Unauthorized)],
+      handlers: [http.all('*/api/v1/releases', response401Unauthorized)],
     },
   },
 }
diff --git a/next-ui/src/components/RemoteFileList.stories.ts b/next-ui/src/components/RemoteFileList.stories.ts
index a9b1797d5..4d52e6cba 100644
--- a/next-ui/src/components/RemoteFileList.stories.ts
+++ b/next-ui/src/components/RemoteFileList.stories.ts
@@ -35,7 +35,7 @@ export const PresetPath: Story = {
 export const Loading: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', async () => await delay(2_000))],
+      handlers: [http.all('*/api/v1/filesystem', async () => await delay(2_000))],
     },
   },
 }
@@ -43,7 +43,7 @@ export const Loading: Story = {
 export const Error: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', response401Unauthorized)],
+      handlers: [http.all('*/api/v1/filesystem', response401Unauthorized)],
     },
   },
 }
diff --git a/next-ui/src/components/dialog/SeriesPicker.stories.ts b/next-ui/src/components/dialog/SeriesPicker.stories.ts
index 23c97bcd7..fb47b5e83 100644
--- a/next-ui/src/components/dialog/SeriesPicker.stories.ts
+++ b/next-ui/src/components/dialog/SeriesPicker.stories.ts
@@ -45,7 +45,7 @@ export const NoResults: Story = {
 export const Loading: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', async () => await delay(2_000))],
+      handlers: [http.all('*/api/v1/series/list', async () => await delay(2_000))],
     },
   },
 }
@@ -56,7 +56,7 @@ export const Error: Story = {
   },
   parameters: {
     msw: {
-      handlers: [http.all('*', response401Unauthorized)],
+      handlers: [http.all('*/api/v1/series/list', response401Unauthorized)],
     },
   },
 }
diff --git a/next-ui/src/components/history/Table.stories.ts b/next-ui/src/components/history/Table.stories.ts
index 44406d85e..900a3a5b0 100644
--- a/next-ui/src/components/history/Table.stories.ts
+++ b/next-ui/src/components/history/Table.stories.ts
@@ -32,7 +32,7 @@ export const Default: Story = {
 export const Loading: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', async () => await delay(5_000))],
+      handlers: [http.all('*/api/v1/history', async () => await delay(5_000))],
     },
   },
 }
@@ -52,7 +52,7 @@ export const NoData: Story = {
 export const Error: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', response401Unauthorized)],
+      handlers: [http.all('*/api/v1/history', response401Unauthorized)],
     },
   },
 }
diff --git a/next-ui/src/components/user/AuthenticationActivityTable.stories.ts b/next-ui/src/components/user/AuthenticationActivityTable.stories.ts
index 82e3b028b..fb7e465b0 100644
--- a/next-ui/src/components/user/AuthenticationActivityTable.stories.ts
+++ b/next-ui/src/components/user/AuthenticationActivityTable.stories.ts
@@ -38,7 +38,9 @@ export const ForMe: Story = {
 export const Loading: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', async () => await delay(5_000))],
+      handlers: [
+        http.all('*/api/v2/users/authentication-activity', async () => await delay(5_000)),
+      ],
     },
   },
 }
@@ -58,7 +60,7 @@ export const NoData: Story = {
 export const Error: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', response401Unauthorized)],
+      handlers: [http.all('*/api/v2/users/authentication-activity', response401Unauthorized)],
     },
   },
 }
diff --git a/next-ui/src/pages/server/announcements.stories.ts b/next-ui/src/pages/server/announcements.stories.ts
index 777f2b79f..a5890c116 100644
--- a/next-ui/src/pages/server/announcements.stories.ts
+++ b/next-ui/src/pages/server/announcements.stories.ts
@@ -55,7 +55,7 @@ export const NoUnread: Story = {
 export const Loading: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', async () => await delay(5_000))],
+      handlers: [http.all('*/api/v1/announcements', async () => await delay(5_000))],
     },
   },
 }
@@ -63,7 +63,7 @@ export const Loading: Story = {
 export const Error: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', response401Unauthorized)],
+      handlers: [http.all('*/api/v1/announcements', response401Unauthorized)],
     },
   },
 }
diff --git a/next-ui/src/pages/server/settings.stories.ts b/next-ui/src/pages/server/settings.stories.ts
index 84d71be74..626d4f7a6 100644
--- a/next-ui/src/pages/server/settings.stories.ts
+++ b/next-ui/src/pages/server/settings.stories.ts
@@ -41,7 +41,7 @@ export const SaveFail: Story = {
 export const Loading: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', async () => await delay(5_000))],
+      handlers: [http.all('*/api/v1/settings', async () => await delay(5_000))],
     },
   },
 }
@@ -49,7 +49,7 @@ export const Loading: Story = {
 export const Error: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', response401Unauthorized)],
+      handlers: [http.all('*/api/v1/settings', response401Unauthorized)],
     },
   },
 }
diff --git a/next-ui/src/pages/server/updates.stories.ts b/next-ui/src/pages/server/updates.stories.ts
index d29e87e30..1cf9760a1 100644
--- a/next-ui/src/pages/server/updates.stories.ts
+++ b/next-ui/src/pages/server/updates.stories.ts
@@ -44,7 +44,7 @@ export const Outdated: Story = {
 export const Loading: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', async () => await delay(5_000))],
+      handlers: [http.all('*/api/v1/releases', async () => await delay(5_000))],
     },
   },
 }
@@ -52,7 +52,7 @@ export const Loading: Story = {
 export const Error: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', response401Unauthorized)],
+      handlers: [http.all('*/api/v1/releases', response401Unauthorized)],
     },
   },
 }
diff --git a/next-ui/src/pages/server/users.stories.ts b/next-ui/src/pages/server/users.stories.ts
index 827348be7..577e93eaf 100644
--- a/next-ui/src/pages/server/users.stories.ts
+++ b/next-ui/src/pages/server/users.stories.ts
@@ -35,7 +35,7 @@ export const Default: Story = {
 export const Loading: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', async () => await delay(5_000))],
+      handlers: [http.all('*/api/*', async () => await delay(5_000))],
     },
   },
 }
@@ -43,7 +43,7 @@ export const Loading: Story = {
 export const Error: Story = {
   parameters: {
     msw: {
-      handlers: [http.all('*', response401Unauthorized)],
+      handlers: [http.all('*/api/*', response401Unauthorized)],
     },
   },
 }