diff --git a/framework/core/js/src/admin/components/AdminPage.tsx b/framework/core/js/src/admin/components/AdminPage.tsx
index 4d1d47add3..460d9037eb 100644
--- a/framework/core/js/src/admin/components/AdminPage.tsx
+++ b/framework/core/js/src/admin/components/AdminPage.tsx
@@ -351,6 +351,13 @@ export default abstract class AdminPage<CustomAttrs extends IPageAttrs = IPageAt
     app.alerts.show({ type: 'success' }, app.translator.trans('core.admin.settings.saved_message'));
   }
 
+  /**
+   * Called when `saveSettings` completes with errors.
+   */
+  onsavefailed(): void {
+    this.loading = false;
+  }
+
   /**
    * Returns a function that fetches the setting from the `app` global.
    */
@@ -394,6 +401,6 @@ export default abstract class AdminPage<CustomAttrs extends IPageAttrs = IPageAt
 
     this.loading = true;
 
-    return saveSettings(this.dirty()).then(this.onsaved.bind(this));
+    return saveSettings(this.dirty()).then(this.onsaved.bind(this)).catch(this.onsavefailed.bind(this));
   }
 }