From 2d7ea2632d1ec8bec372346fcd34ad8924ae84ad Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Sat, 3 Oct 2026 19:57:22 +0300
Subject: [PATCH] Fix 404 page showing you as logged out

---
 app/root.tsx                                 | 20 ++++++++++++++++++--
 changelog/2026-10-03-error-page-logged-in.md |  4 ++++
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 changelog/2026-10-03-error-page-logged-in.md

diff --git a/app/root.tsx b/app/root.tsx
index f52ffd2cd..8246d9d46 100644
--- a/app/root.tsx
+++ b/app/root.tsx
@@ -20,6 +20,7 @@ import {
 	useNavigate,
 	useNavigation,
 	useRevalidator,
+	useRouteLoaderData,
 	useSearchParams,
 } from "react-router";
 import { Config } from "~/config";
@@ -440,9 +441,24 @@ export default function App() {
 }
 
 export function ErrorBoundary() {
+	const rootData = useRouteLoaderData<RootLoaderData>("root");
+
+	if (!rootData) {
+		return (
+			<ThemeProvider themeSource="static" specifiedTheme={Theme.DARK}>
+				<Document>
+					<Catcher />
+				</Document>
+			</ThemeProvider>
+		);
+	}
+
 	return (
-		<ThemeProvider themeSource="static" specifiedTheme={Theme.DARK}>
-			<Document>
+		<ThemeProvider
+			specifiedTheme={isTheme(rootData.theme) ? rootData.theme : null}
+			themeSource="user-preference"
+		>
+			<Document data={rootData}>
 				<Catcher />
 			</Document>
 		</ThemeProvider>
diff --git a/changelog/2026-10-03-error-page-logged-in.md b/changelog/2026-10-03-error-page-logged-in.md
new file mode 100644
index 000000000..ae9ba9789
--- /dev/null
+++ b/changelog/2026-10-03-error-page-logged-in.md
@@ -0,0 +1,4 @@
+---
+type: bug
+---
+Error pages such as "Page not found" no longer show you as logged out