diff --git a/packages/site-kit/src/lib/components/ThemeToggle.svelte b/packages/site-kit/src/lib/components/ThemeToggle.svelte
index 5e93614caf..21c71a2ea1 100644
--- a/packages/site-kit/src/lib/components/ThemeToggle.svelte
+++ b/packages/site-kit/src/lib/components/ThemeToggle.svelte
@@ -14,9 +14,12 @@
 		if ($theme.preference === 'system') {
 			const query = window.matchMedia('(prefers-color-scheme: dark)');
 
-			return on(query, 'change', (e) => {
+			function setTheme(e: MediaQueryListEvent | MediaQueryList) {
 				$theme.current = e.matches ? 'dark' : 'light';
-			});
+			}
+
+			setTheme(query);
+			return on(query, 'change', setTheme);
 		}
 	});
 </script>