summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--web/react/components/user_settings/user_settings_modal.jsx4
1 files changed, 3 insertions, 1 deletions
diff --git a/web/react/components/user_settings/user_settings_modal.jsx b/web/react/components/user_settings/user_settings_modal.jsx
index 57796d559..e0b72157b 100644
--- a/web/react/components/user_settings/user_settings_modal.jsx
+++ b/web/react/components/user_settings/user_settings_modal.jsx
@@ -216,7 +216,9 @@ class UserSettingsModal extends React.Component {
} else {
if (this.state.active_section === 'theme' && section !== 'theme') {
const user = UserStore.getCurrentUser();
- Utils.applyTheme(user.theme_props);
+ if (user.theme_props != null) {
+ Utils.applyTheme(user.theme_props);
+ }
}
this.setState({active_section: section});
}