diff --git a/app/src/modules/server/AdminController.tsx b/app/src/modules/server/AdminController.tsx
index 35ebc81..227e22b 100644
--- a/app/src/modules/server/AdminController.tsx
+++ b/app/src/modules/server/AdminController.tsx
@@ -51,7 +51,7 @@ export class AdminController extends Controller {
          basepath: this._options.basepath ?? "/",
          adminBasepath: this._options.adminBasepath ?? "",
          assetsPath: this._options.assetsPath ?? config.server.assets_path,
-         theme: this._options.theme ?? "system",
+         //theme: this._options.theme ?? "system",
          logo_return_path: this._options.logoReturnPath ?? "/",
       };
    }
diff --git a/app/src/ui/Admin.tsx b/app/src/ui/Admin.tsx
index 86b4e8e..df142ac 100644
--- a/app/src/ui/Admin.tsx
+++ b/app/src/ui/Admin.tsx
@@ -55,7 +55,7 @@ export default function Admin({
 
 const Skeleton = ({ theme }: { theme?: any }) => {
    const t = useTheme();
-   const actualTheme = theme ?? t.theme;
+   const actualTheme = theme && ["dark", "light"].includes(theme) ? theme : t.theme;
 
    return (
       <div id="bknd-admin" className={actualTheme + " antialiased"}>
diff --git a/app/src/ui/layouts/AppShell/Header.tsx b/app/src/ui/layouts/AppShell/Header.tsx
index 0b313c5..629d537 100644
--- a/app/src/ui/layouts/AppShell/Header.tsx
+++ b/app/src/ui/layouts/AppShell/Header.tsx
@@ -185,9 +185,7 @@ function UserMenu() {
       }
    }
 
-   if (!options.theme) {
-      items.push(() => <UserMenuThemeToggler />);
-   }
+   items.push(() => <UserMenuThemeToggler />);
    items.push(() => (
       <div className="font-mono leading-none text-xs text-primary/50 text-center pb-1 pt-2 mt-1 border-t border-primary/5">
          {getVersion()}
diff --git a/bun.lock b/bun.lock
index 434b81f..008d7b4 100644
--- a/bun.lock
+++ b/bun.lock
@@ -15,7 +15,7 @@
     },
     "app": {
       "name": "bknd",
-      "version": "0.15.0-rc.3",
+      "version": "0.15.0-rc.8",
       "bin": "./dist/cli/index.js",
       "dependencies": {
         "@cfworker/json-schema": "^4.1.1",