diff --git a/src/routes/(account)/+layout.svelte b/src/routes/(account)/+layout.svelte
index 17b62efa..487d3ae1 100644
--- a/src/routes/(account)/+layout.svelte
+++ b/src/routes/(account)/+layout.svelte
@@ -10,7 +10,7 @@
   import KenerNav from "$lib/components/KenerNav.svelte";
 </script>
 
-<ModeWatcher />
+<ModeWatcher defaultMode={data.defaultSiteTheme as 'light' | 'dark' | 'system'} />
 <Toaster />
 
 <svelte:head>
diff --git a/src/routes/(embed)/+layout.svelte b/src/routes/(embed)/+layout.svelte
index ce7f773c..ba7c306f 100644
--- a/src/routes/(embed)/+layout.svelte
+++ b/src/routes/(embed)/+layout.svelte
@@ -9,7 +9,7 @@
   let { children, data } = $props();
 </script>
 
-<ModeWatcher />
+<ModeWatcher defaultMode={data.defaultSiteTheme as 'light' | 'dark' | 'system'} />
 <Toaster />
 
 <svelte:head>
diff --git a/src/routes/(kener)/+layout.svelte b/src/routes/(kener)/+layout.svelte
index 68b1ddc6..3725bb4e 100644
--- a/src/routes/(kener)/+layout.svelte
+++ b/src/routes/(kener)/+layout.svelte
@@ -20,7 +20,7 @@
   });
 </script>
 
-<ModeWatcher />
+<ModeWatcher defaultMode={data.defaultSiteTheme as 'light' | 'dark' | 'system'} />
 
 <Toaster />
 
diff --git a/src/routes/(manage)/+layout.server.ts b/src/routes/(manage)/+layout.server.ts
index 1112a161..c7a3d47a 100644
--- a/src/routes/(manage)/+layout.server.ts
+++ b/src/routes/(manage)/+layout.server.ts
@@ -49,12 +49,14 @@ export const load: LayoutServerLoad = async ({ cookies, route }) => {
   const siteStatusColors = siteData.colors;
   const siteStatusColorsDark = siteData.colorsDark || siteStatusColors;
   const font = siteData.font || { cssSrc: "", family: "" };
+  const defaultSiteTheme = siteData.theme || "system";
   return {
     userDb: loggedInUser,
     userPermissions: [...userPermissions],
     siteStatusColors,
     siteStatusColorsDark,
     font,
+    defaultSiteTheme,
     canSendEmail: IsEmailSetup(),
     seedSiteData,
   };
diff --git a/src/routes/(manage)/+layout.svelte b/src/routes/(manage)/+layout.svelte
index be78f2cc..70df1382 100644
--- a/src/routes/(manage)/+layout.svelte
+++ b/src/routes/(manage)/+layout.svelte
@@ -71,7 +71,7 @@
   let pageTitle = $derived(navItems.find((item) => page.url.pathname.startsWith(item.url))?.title || "Dashboard");
 </script>
 
-<ModeWatcher />
+<ModeWatcher defaultMode={data.defaultSiteTheme as 'light' | 'dark' | 'system'} />
 <Toaster />
 
 <svelte:head>