diff --git a/website/src/AppState.ts b/website/src/AppState.ts
index e8d5cbbd..0a8580f4 100644
--- a/website/src/AppState.ts
+++ b/website/src/AppState.ts
@@ -13,7 +13,10 @@ class GlobalAppState {
       loadingError: observable,
     });
 
-    this.darkMode = false;
+    const prefersDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;
+    const storedDarkMode = localStorage.getItem('customDarkMode');
+    
+    this.darkMode = storedDarkMode !== null ? JSON.parse(storedDarkMode) : prefersDarkMode;
   }
 
   setDarkMode(darkMode: boolean) {