diff --git a/components/app/theme-toggle.tsx b/components/app/theme-toggle.tsx
index ffefc0da..9df05fdc 100644
--- a/components/app/theme-toggle.tsx
+++ b/components/app/theme-toggle.tsx
@@ -52,16 +52,17 @@ export function ApplyThemeScript() {
 export function ThemeToggle({ className }: ThemeToggleProps) {
   const [theme, setTheme] = useState<ThemeMode | undefined>(undefined);
 
+  function handleThemeChange(theme: ThemeMode) {
+    applyTheme(theme);
+    setTheme(theme);
+  }
+  
   useEffect(() => {
     const storedTheme = (localStorage.getItem(THEME_STORAGE_KEY) as ThemeMode) ?? 'system';
 
-    setTheme(storedTheme);
+    handleThemeChange(storedTheme);
   }, []);
 
-  function handleThemeChange(theme: ThemeMode) {
-    applyTheme(theme);
-    setTheme(theme);
-  }
 
   return (
     <div