1 files changed, 3 insertions, 1 deletions
diff --git a/web/react/components/user_settings/user_settings_appearance.jsx b/web/react/components/user_settings/user_settings_appearance.jsx
index e94894a1d..7b4b54e27 100644
--- a/web/react/components/user_settings/user_settings_appearance.jsx
+++ b/web/react/components/user_settings/user_settings_appearance.jsx
@@ -100,7 +100,9 @@ export default class UserSettingsAppearance extends React.Component {
         );
     }
     updateTheme(theme) {
-        theme.codeTheme = this.state.theme.codeTheme;
+        if (!theme.codeTheme) {
+            theme.codeTheme = this.state.theme.codeTheme;
+        }
         this.setState({theme});
         Utils.applyTheme(theme);
     }