diff --git a/frontend/src/routes/admin/tags/[id]/+page.svelte b/frontend/src/routes/admin/tags/[id]/+page.svelte
index 8278d7c5..7fbd52c0 100644
--- a/frontend/src/routes/admin/tags/[id]/+page.svelte
+++ b/frontend/src/routes/admin/tags/[id]/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
 import { replaceState } from '$app/navigation';
-import { page } from '$app/stores';
+import { page } from '$app/state';
 import { m } from '$lib/paraglide/messages.js';
 import { createUnsavedWarning } from '$lib/shared/hooks/useUnsavedWarning.svelte';
 import UnsavedWarningBanner from '$lib/shared/primitives/UnsavedWarningBanner.svelte';
@@ -44,7 +44,7 @@ $effect(() => {
 
 $effect(() => {
 	if (data.mergeSuccess) {
-		replaceState($page.url.pathname, {});
+		replaceState(page.url.pathname, {});
 	}
 });
 
diff --git a/frontend/src/routes/admin/tags/[id]/page.svelte.spec.ts b/frontend/src/routes/admin/tags/[id]/page.svelte.spec.ts
index d4386c0d..792e90f3 100644
--- a/frontend/src/routes/admin/tags/[id]/page.svelte.spec.ts
+++ b/frontend/src/routes/admin/tags/[id]/page.svelte.spec.ts
@@ -10,12 +10,9 @@ vi.mock('$app/navigation', () => ({
 	goto: vi.fn(),
 	replaceState: vi.fn()
 }));
-vi.mock('$app/stores', () => ({
-	page: {
-		subscribe: (fn: (v: { url: URL }) => void) => {
-			fn({ url: new URL('http://localhost/admin/tags/t1') });
-			return () => {};
-		}
+vi.mock('$app/state', () => ({
+	get page() {
+		return { url: new URL('http://localhost/admin/tags/t1') };
 	}
 }));
 
diff --git a/frontend/src/routes/admin/tags/[id]/page.svelte.test.ts b/frontend/src/routes/admin/tags/[id]/page.svelte.test.ts
index 5297722e..bc946d94 100644
--- a/frontend/src/routes/admin/tags/[id]/page.svelte.test.ts
+++ b/frontend/src/routes/admin/tags/[id]/page.svelte.test.ts
@@ -2,14 +2,11 @@ import { describe, it, expect, vi, afterEach } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 
-const mockPage = { url: { pathname: '/admin/tags/t1' } };
+const mockPage = { url: new URL('http://localhost/admin/tags/t1') };
 
-vi.mock('$app/stores', () => ({
-	page: {
-		subscribe: (fn: (v: typeof mockPage) => void) => {
-			fn(mockPage);
-			return () => {};
-		}
+vi.mock('$app/state', () => ({
+	get page() {
+		return mockPage;
 	}
 }));