1 files changed, 8 insertions, 2 deletions

diff --git a/web/react/components/user_settings/user_settings_modal.jsx b/web/react/components/user_settings/user_settings_modal.jsx
index 5442f7ac4..80d03d88e 100644
--- a/web/react/components/user_settings/user_settings_modal.jsx
+++ b/web/react/components/user_settings/user_settings_modal.jsx
@@ -111,12 +111,13 @@ class UserSettingsModal extends React.Component {
             this.afterConfirm = () => this.handleHide();
             this.showConfirmModal();
 
-            return false;
+            return;
         }
 
         this.resetTheme();
         this.deactivateTab();
         this.props.onModalDismissed();
+        return;
     }
 
     // called after the dialog is fully hidden and faded out
@@ -295,7 +296,12 @@ class UserSettingsModal extends React.Component {
                                 closeModal={this.closeModal}
                                 collapseModal={this.collapseModal}
                                 setEnforceFocus={(enforceFocus) => this.setState({enforceFocus})}
-                                setRequireConfirm={(requireConfirm) => this.requireConfirm = requireConfirm}
+                                setRequireConfirm={
+                                    (requireConfirm) => {
+                                        this.requireConfirm = requireConfirm;
+                                        return;
+                                    }
+                                }
                             />
                         </div>
                     </div>