diff --git a/frontend/src/Settings/General/GeneralSettings.js b/frontend/src/Settings/General/GeneralSettings.js
index 60b216bab..803325d51 100644
--- a/frontend/src/Settings/General/GeneralSettings.js
+++ b/frontend/src/Settings/General/GeneralSettings.js
@@ -26,8 +26,7 @@ const requiresRestartKeys = [
   'sslCertPassword',
   'authenticationMethod',
   'username',
-  'password',
-  'apiKey'
+  'password'
 ];
 
 class GeneralSettings extends Component {
@@ -47,9 +46,15 @@ class GeneralSettings extends Component {
     const {
       settings,
       isSaving,
-      saveError
+      saveError,
+      isResettingApiKey
     } = this.props;
 
+    if (!isResettingApiKey && prevProps.isResettingApiKey) {
+      this.setState({ isRestartRequiredModalOpen: true });
+      return;
+    }
+
     if (isSaving || saveError || !prevProps.isSaving) {
       return;
     }