diff --git a/apps/svelte.dev/src/routes/(authed)/playground/[id]/embed/+page.svelte b/apps/svelte.dev/src/routes/(authed)/playground/[id]/embed/+page.svelte
index 8f1a04ef66..65d6c17850 100644
--- a/apps/svelte.dev/src/routes/(authed)/playground/[id]/embed/+page.svelte
+++ b/apps/svelte.dev/src/routes/(authed)/playground/[id]/embed/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { browser } from '$app/environment';
-	import { afterNavigate } from '$app/navigation';
+	import { afterNavigate, replaceState } from '$app/navigation';
 	import { theme } from '@sveltejs/site-kit/stores';
 	import { Repl } from '@sveltejs/repl';
 	import { mapbox_setup } from '../../../../../config.js';
@@ -8,32 +8,16 @@
 
 	let { data } = $props();
 
-	let version = $state(data.version);
 	let repl = $state() as Repl;
 
-	function update_query_string(version: string) {
-		const params = [];
-
-		if (version !== 'latest') params.push(`version=${version}`);
-
-		const url =
-			params.length > 0
-				? `/playground/${data.gist.id}/embed?${params.join('&')}`
-				: `/playground/${data.gist.id}/embed`;
-
-		history.replaceState({}, 'x', url);
-	}
-
-	$effect(() => {
-		update_query_string(version);
-	});
-
 	onMount(() => {
 		if (data.version !== 'local') {
-			fetch(`https://unpkg.com/svelte@${data.version || 'next'}/package.json`)
+			fetch(`https://unpkg.com/svelte@${data.version}/package.json`)
 				.then((r) => r.json())
 				.then((pkg) => {
-					version = pkg.version;
+					if (pkg.version !== data.version) {
+						replaceState(`/playground/${data.gist.id}/embed?version=${pkg.version}`, {});
+					}
 				});
 		}
 	});
@@ -44,11 +28,10 @@
 		});
 	});
 
-	const svelteUrl = $derived(
-		browser && version === 'local'
+	const svelteUrl =
+		browser && data.version === 'local'
 			? `${location.origin}/playground/local`
-			: `https://unpkg.com/svelte@${version}`
-	);
+			: `https://unpkg.com/svelte@${data.version}`;
 
 	const relaxed = $derived(data.gist.relaxed || (data.user && data.user.id === data.gist.owner));
 </script>
diff --git a/apps/svelte.dev/src/routes/(authed)/playground/api/[id].json/+server.js b/apps/svelte.dev/src/routes/(authed)/playground/api/[id].json/+server.js
index d8445033de..a132b2e5b0 100644
--- a/apps/svelte.dev/src/routes/(authed)/playground/api/[id].json/+server.js
+++ b/apps/svelte.dev/src/routes/(authed)/playground/api/[id].json/+server.js
@@ -84,8 +84,6 @@ export async function GET({ params }) {
 }
 
 export async function entries() {
-	const { get_examples_list } = await import('$lib/server/examples/index.js');
-
 	return get_examples_list(examples_data)
 		.map(({ examples }) => examples)
 		.flatMap((val) => val.map(({ slug }) => ({ id: slug })));
diff --git a/apps/svelte.dev/src/routes/(authed)/playground/embed/+page.server.js b/apps/svelte.dev/src/routes/(authed)/playground/embed/+page.server.js
deleted file mode 100644
index c0fe2147b9..0000000000
--- a/apps/svelte.dev/src/routes/(authed)/playground/embed/+page.server.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { redirect } from '@sveltejs/kit';
-
-export function load({ url }) {
-	if (!url.searchParams.has('gist')) {
-		throw redirect(301, '/playground/hello-world/embed');
-	} else {
-		const searchParamsWithoutGist = new URLSearchParams(url.searchParams);
-		searchParamsWithoutGist.delete('gist');
-		throw redirect(
-			301,
-			`/playground/${url.searchParams.get('gist')}/embed?${searchParamsWithoutGist.toString()}`
-		);
-	}
-}
diff --git a/apps/svelte.dev/src/routes/(authed)/playground/embed/+page.server.ts b/apps/svelte.dev/src/routes/(authed)/playground/embed/+page.server.ts
new file mode 100644
index 0000000000..347989e580
--- /dev/null
+++ b/apps/svelte.dev/src/routes/(authed)/playground/embed/+page.server.ts
@@ -0,0 +1,17 @@
+import { redirect } from '@sveltejs/kit';
+
+export function load({ url }) {
+	if (url.searchParams.has('example')) {
+		redirect(308, construct_embed_url(url.searchParams, 'example'));
+	} else if (url.searchParams.has('gist')) {
+		redirect(308, construct_embed_url(url.searchParams, 'gist'));
+	} else {
+		redirect(308, '/playground/hello-world/embed');
+	}
+}
+
+function construct_embed_url(searchParams: URLSearchParams, param: string) {
+	const cleaned_params = new URLSearchParams(searchParams);
+	cleaned_params.delete(param);
+	return `/playground/${searchParams.get(param)}/embed?${cleaned_params.toString()}`;
+}