diff --git a/src/App.tsx b/src/App.tsx
index 0d1f1df..15562c6 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -31,10 +31,11 @@ function App() {
   const [authReady, setAuthReady] = useState(false);
 
   useEffect(() => {
-    initializeTheme();
+    const cleanupTheme = initializeTheme();
     void restoreSession().finally(() => {
       setAuthReady(true);
     });
+    return cleanupTheme;
   }, [initializeTheme, restoreSession]);
 
   useEffect(() => {
diff --git a/src/components/layout/MainLayout.tsx b/src/components/layout/MainLayout.tsx
index 28f2b01..b132e6d 100644
--- a/src/components/layout/MainLayout.tsx
+++ b/src/components/layout/MainLayout.tsx
@@ -119,12 +119,12 @@ const headerIcons = {
   autoTheme: (
     <svg {...headerIconProps}>
       <defs>
-        <clipPath id="sunLeftHalf">
+        <clipPath id="mainLayoutAutoThemeSunLeftHalf">
           <rect x="0" y="0" width="12" height="24" />
         </clipPath>
       </defs>
       <circle cx="12" cy="12" r="4" />
-      <circle cx="12" cy="12" r="4" clipPath="url(#sunLeftHalf)" fill="currentColor" />
+      <circle cx="12" cy="12" r="4" clipPath="url(#mainLayoutAutoThemeSunLeftHalf)" fill="currentColor" />
       <path d="M12 2v2" />
       <path d="M12 20v2" />
       <path d="M4.93 4.93l1.41 1.41" />
@@ -469,7 +469,7 @@ export function MainLayout() {
             <Button variant="ghost" size="sm" onClick={toggleLanguage} title={t('language.switch')}>
               {headerIcons.language}
             </Button>
-            <Button variant="ghost" size="sm" onClick={cycleTheme} title={t(`theme.${theme}`)}>
+            <Button variant="ghost" size="sm" onClick={cycleTheme} title={t('theme.switch')}>
               {theme === 'auto'
                 ? headerIcons.autoTheme
                 : theme === 'dark'
diff --git a/src/stores/useThemeStore.ts b/src/stores/useThemeStore.ts
index c7de061..65088ce 100644
--- a/src/stores/useThemeStore.ts
+++ b/src/stores/useThemeStore.ts
@@ -15,7 +15,7 @@ interface ThemeState {
   resolvedTheme: ResolvedTheme;
   setTheme: (theme: Theme) => void;
   cycleTheme: () => void;
-  initializeTheme: () => void;
+  initializeTheme: () => () => void;
 }
 
 const getSystemTheme = (): ResolvedTheme => {
@@ -60,16 +60,23 @@ export const useThemeStore = create<ThemeState>()(
         setTheme(theme);
 
         // 监听系统主题变化（仅在 auto 模式下生效）
-        if (window.matchMedia) {
-          window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
-            const { theme: currentTheme } = get();
-            if (currentTheme === 'auto') {
-              const resolved = getSystemTheme();
-              applyTheme(resolved);
-              set({ resolvedTheme: resolved });
-            }
-          });
+        if (!window.matchMedia) {
+          return () => {};
         }
+
+        const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
+        const listener = () => {
+          const { theme: currentTheme } = get();
+          if (currentTheme === 'auto') {
+            const resolved = getSystemTheme();
+            applyTheme(resolved);
+            set({ resolvedTheme: resolved });
+          }
+        };
+
+        mediaQuery.addEventListener('change', listener);
+
+        return () => mediaQuery.removeEventListener('change', listener);
       },
     }),
     {