diff --git a/src/renderer/src/context/SyntaxHighlighterProvider.tsx b/src/renderer/src/context/SyntaxHighlighterProvider.tsx
index eae545c8..b2dd13db 100644
--- a/src/renderer/src/context/SyntaxHighlighterProvider.tsx
+++ b/src/renderer/src/context/SyntaxHighlighterProvider.tsx
@@ -24,8 +24,11 @@ export const SyntaxHighlighterProvider: React.FC<PropsWithChildren> = ({ childre
   const { codeStyle } = useSettings()
 
   const highlighterTheme = useMemo(() => {
-    if (codeStyle === 'auto') return theme === ThemeMode.light ? 'one-light' : 'material-theme-darker'
-    else return codeStyle
+    if (!codeStyle || codeStyle === 'auto') {
+      return theme === ThemeMode.light ? 'one-light' : 'material-theme-darker'
+    }
+
+    return codeStyle
   }, [theme, codeStyle])
 
   useEffect(() => {
diff --git a/src/renderer/src/store/index.ts b/src/renderer/src/store/index.ts
index 32157109..f628d93b 100644
--- a/src/renderer/src/store/index.ts
+++ b/src/renderer/src/store/index.ts
@@ -24,7 +24,7 @@ const persistedReducer = persistReducer(
   {
     key: 'cherry-studio',
     storage,
-    version: 38,
+    version: 39,
     blacklist: ['runtime'],
     migrate
   },
diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts
index 73e19e8d..09b1afb7 100644
--- a/src/renderer/src/store/migrate.ts
+++ b/src/renderer/src/store/migrate.ts
@@ -669,6 +669,10 @@ const migrateConfig = {
         ]
       }
     }
+  },
+  '39': (state: RootState) => {
+    state.settings.codeStyle = 'auto'
+    return state
   }
 }