diff --git a/src/routes/(app)/admin/+layout.svelte b/src/routes/(app)/admin/+layout.svelte
index 36938c8ecd..199ab9342d 100644
--- a/src/routes/(app)/admin/+layout.svelte
+++ b/src/routes/(app)/admin/+layout.svelte
@@ -14,12 +14,12 @@
 
 	onMount(async () => {
 		if ($user?.role !== 'admin') {
-			await goto('/');
+			await goto('/', { replaceState: true });
 		} else if (
 			!$config?.features?.enable_plugins &&
 			$page.url.pathname.includes('/admin/functions')
 		) {
-			await goto('/admin');
+			await goto('/admin', { replaceState: true });
 		}
 		loaded = true;
 	});
diff --git a/src/routes/(app)/admin/+page.svelte b/src/routes/(app)/admin/+page.svelte
index 2f12bbab80..c6aad81a38 100644
--- a/src/routes/(app)/admin/+page.svelte
+++ b/src/routes/(app)/admin/+page.svelte
@@ -3,6 +3,6 @@
 	import { onMount } from 'svelte';
 
 	onMount(() => {
-		goto('/admin/users');
+		goto('/admin/users', { replaceState: true });
 	});
 </script>
diff --git a/src/routes/(app)/admin/analytics/+page.svelte b/src/routes/(app)/admin/analytics/+page.svelte
index c4de672a4b..302f4c4261 100644
--- a/src/routes/(app)/admin/analytics/+page.svelte
+++ b/src/routes/(app)/admin/analytics/+page.svelte
@@ -5,7 +5,7 @@
 
 	onMount(() => {
 		if (!($config?.features.enable_admin_analytics ?? true)) {
-			goto('/admin');
+			goto('/admin', { replaceState: true });
 		} else {
 			goto('/?settings=admin%3Aanalytics', { replaceState: true });
 		}
diff --git a/src/routes/(app)/admin/analytics/[tab]/+page.svelte b/src/routes/(app)/admin/analytics/[tab]/+page.svelte
index c4de672a4b..302f4c4261 100644
--- a/src/routes/(app)/admin/analytics/[tab]/+page.svelte
+++ b/src/routes/(app)/admin/analytics/[tab]/+page.svelte
@@ -5,7 +5,7 @@
 
 	onMount(() => {
 		if (!($config?.features.enable_admin_analytics ?? true)) {
-			goto('/admin');
+			goto('/admin', { replaceState: true });
 		} else {
 			goto('/?settings=admin%3Aanalytics', { replaceState: true });
 		}
diff --git a/src/routes/(app)/admin/evaluations/+page.svelte b/src/routes/(app)/admin/evaluations/+page.svelte
index b0c6ca903c..8913071b7f 100644
--- a/src/routes/(app)/admin/evaluations/+page.svelte
+++ b/src/routes/(app)/admin/evaluations/+page.svelte
@@ -3,6 +3,6 @@
 	import { onMount } from 'svelte';
 
 	onMount(() => {
-		goto('/admin/evaluations/leaderboard');
+		goto('/admin/evaluations/leaderboard', { replaceState: true });
 	});
 </script>
diff --git a/src/routes/(app)/admin/functions/+page.svelte b/src/routes/(app)/admin/functions/+page.svelte
index 48f75e4b9a..3d63b6e247 100644
--- a/src/routes/(app)/admin/functions/+page.svelte
+++ b/src/routes/(app)/admin/functions/+page.svelte
@@ -8,7 +8,7 @@
 
 	onMount(async () => {
 		if (!$config?.features?.enable_plugins) {
-			await goto('/admin');
+			await goto('/admin', { replaceState: true });
 			return;
 		}
 
diff --git a/src/routes/(app)/admin/functions/create/+page.svelte b/src/routes/(app)/admin/functions/create/+page.svelte
index 0629caecc1..ee1564bd85 100644
--- a/src/routes/(app)/admin/functions/create/+page.svelte
+++ b/src/routes/(app)/admin/functions/create/+page.svelte
@@ -62,7 +62,7 @@
 
 	onMount(() => {
 		if (!$config?.features?.enable_plugins) {
-			goto('/admin');
+			goto('/admin', { replaceState: true });
 			return;
 		}
 
diff --git a/src/routes/(app)/admin/functions/edit/+page.svelte b/src/routes/(app)/admin/functions/edit/+page.svelte
index bd6fae3503..6fcab73094 100644
--- a/src/routes/(app)/admin/functions/edit/+page.svelte
+++ b/src/routes/(app)/admin/functions/edit/+page.svelte
@@ -61,7 +61,7 @@
 
 	onMount(async () => {
 		if (!$config?.features?.enable_plugins) {
-			goto('/admin');
+			goto('/admin', { replaceState: true });
 			return;
 		}
 
diff --git a/src/routes/(app)/admin/users/+page.svelte b/src/routes/(app)/admin/users/+page.svelte
index 3f20096169..ebf29a7ab5 100644
--- a/src/routes/(app)/admin/users/+page.svelte
+++ b/src/routes/(app)/admin/users/+page.svelte
@@ -3,6 +3,6 @@
 	import { onMount } from 'svelte';
 
 	onMount(async () => {
-		await goto('/admin/users/overview');
+		await goto('/admin/users/overview', { replaceState: true });
 	});
 </script>
diff --git a/src/routes/(app)/workspace/+layout.svelte b/src/routes/(app)/workspace/+layout.svelte
index c5edeb5369..251b78dd8e 100644
--- a/src/routes/(app)/workspace/+layout.svelte
+++ b/src/routes/(app)/workspace/+layout.svelte
@@ -80,24 +80,24 @@
 	onMount(async () => {
 		if ($user?.role !== 'admin') {
 			if ($page.url.pathname.includes('/models') && !$user?.permissions?.workspace?.models) {
-				goto('/');
+				goto('/', { replaceState: true });
 			} else if (
 				$page.url.pathname.includes('/knowledge') &&
 				!$user?.permissions?.workspace?.knowledge
 			) {
-				goto('/');
+				goto('/', { replaceState: true });
 			} else if (
 				$page.url.pathname.includes('/prompts') &&
 				!$user?.permissions?.workspace?.prompts
 			) {
-				goto('/');
+				goto('/', { replaceState: true });
 			} else if (
 				$page.url.pathname.includes('/tools') &&
 				(!$config?.features?.enable_plugins || !$user?.permissions?.workspace?.tools)
 			) {
-				goto('/');
+				goto('/', { replaceState: true });
 			} else if ($page.url.pathname.includes('/skills') && !$user?.permissions?.workspace?.skills) {
-				goto('/');
+				goto('/', { replaceState: true });
 			}
 		}
 
diff --git a/src/routes/(app)/workspace/+page.svelte b/src/routes/(app)/workspace/+page.svelte
index 64ccf5581f..ef7edaf8fc 100644
--- a/src/routes/(app)/workspace/+page.svelte
+++ b/src/routes/(app)/workspace/+page.svelte
@@ -6,20 +6,20 @@
 	onMount(() => {
 		if ($user?.role !== 'admin') {
 			if ($user?.permissions?.workspace?.models) {
-				goto('/workspace/models');
+				goto('/workspace/models', { replaceState: true });
 			} else if ($user?.permissions?.workspace?.knowledge) {
-				goto('/workspace/knowledge');
+				goto('/workspace/knowledge', { replaceState: true });
 			} else if ($user?.permissions?.workspace?.prompts) {
-				goto('/workspace/prompts');
+				goto('/workspace/prompts', { replaceState: true });
 			} else if ($config?.features?.enable_plugins && $user?.permissions?.workspace?.tools) {
-				goto('/workspace/tools');
+				goto('/workspace/tools', { replaceState: true });
 			} else if ($user?.permissions?.workspace?.skills) {
-				goto('/workspace/skills');
+				goto('/workspace/skills', { replaceState: true });
 			} else {
-				goto('/');
+				goto('/', { replaceState: true });
 			}
 		} else {
-			goto('/workspace/models');
+			goto('/workspace/models', { replaceState: true });
 		}
 	});
 </script>
diff --git a/src/routes/(app)/workspace/functions/create/+page.svelte b/src/routes/(app)/workspace/functions/create/+page.svelte
index 14eec3b675..932d288040 100644
--- a/src/routes/(app)/workspace/functions/create/+page.svelte
+++ b/src/routes/(app)/workspace/functions/create/+page.svelte
@@ -3,6 +3,6 @@
 	import { onMount } from 'svelte';
 
 	onMount(() => {
-		goto('/admin/functions/create');
+		goto('/admin/functions/create', { replaceState: true });
 	});
 </script>
diff --git a/src/routes/(app)/workspace/tools/+page.svelte b/src/routes/(app)/workspace/tools/+page.svelte
index 2650bff32f..66c84db5fc 100644
--- a/src/routes/(app)/workspace/tools/+page.svelte
+++ b/src/routes/(app)/workspace/tools/+page.svelte
@@ -7,7 +7,7 @@
 
 	onMount(() => {
 		if (!$config?.features?.enable_plugins) {
-			goto('/workspace');
+			goto('/workspace', { replaceState: true });
 		}
 	});
 </script>