2 files changed, 2 insertions, 4 deletions
diff --git a/webapp/components/admin_console/manage_teams_modal/manage_teams_dropdown.jsx b/webapp/components/admin_console/manage_teams_modal/manage_teams_dropdown.jsx
index e58a2c43d..4ee3c11cd 100644
--- a/webapp/components/admin_console/manage_teams_modal/manage_teams_dropdown.jsx
+++ b/webapp/components/admin_console/manage_teams_modal/manage_teams_dropdown.jsx
@@ -38,8 +38,8 @@ export default class ManageTeamsDropdown extends React.Component {
     }
 
     toggleDropdown() {
-        this.setState({
-            show: !this.state.show
+        this.setState((prevState) => {
+            return {show: !prevState.show};
         });
     }
 
diff --git a/webapp/components/admin_console/push_settings.jsx b/webapp/components/admin_console/push_settings.jsx
index 5a2f6d89b..5461ef730 100644
--- a/webapp/components/admin_console/push_settings.jsx
+++ b/webapp/components/admin_console/push_settings.jsx
@@ -79,8 +79,6 @@ export default class PushSettings extends AdminSettings {
             agree = true;
         } else if (config.EmailSettings.PushNotificationServer === Constants.MTPNS) {
             pushNotificationServerType = PUSH_NOTIFICATIONS_MTPNS;
-        } else {
-            pushNotificationServerType = PUSH_NOTIFICATIONS_CUSTOM;
         }
 
         let pushNotificationServer = config.EmailSettings.PushNotificationServer;