diff --git a/apps/docs/automation-configuration.mdx b/apps/docs/automation-configuration.mdx
index 9e8eedc1f..a2074ea2c 100644
--- a/apps/docs/automation-configuration.mdx
+++ b/apps/docs/automation-configuration.mdx
@@ -26,6 +26,10 @@ automations on or off, and apply the selected set. Skipping the review does not
 enable anything. Recommendations are a starting point: use the **Automations**
 page to change schedules, destinations, workspace targets, prompts, or models.
 
+For Security Auditor, Code Quality Auditor, CI Failure Triage, Triage Issues,
+and Merge announcer, the schedule or enable switch pauses while its settings
+are saving. If a save fails, your draft remains available to edit and retry.
+
 ## Pull request automations
 
 These automations react to pull requests, issues, and repository state.
diff --git a/apps/web/src/components/settings/SettingSummaryRow.tsx b/apps/web/src/components/settings/SettingSummaryRow.tsx
index 7f7d8bab4..28519f7c2 100644
--- a/apps/web/src/components/settings/SettingSummaryRow.tsx
+++ b/apps/web/src/components/settings/SettingSummaryRow.tsx
@@ -7,6 +7,7 @@ export function SettingSummaryRow({
   label,
   value,
   onEdit,
+  disabled = false,
   actionLabel = 'Edit',
   action,
 }: {
@@ -14,6 +15,7 @@ export function SettingSummaryRow({
   label: string;
   value: ReactNode;
   onEdit?: () => void;
+  disabled?: boolean;
   actionLabel?: string;
   action?: ReactNode;
 }) {
@@ -27,6 +29,7 @@ export function SettingSummaryRow({
         </span>
         {action ?? (
           <Button
+            disabled={disabled}
             type="button"
             variant="link"
             size="sm"
diff --git a/apps/web/src/components/settings/automations/AutomationsSettings.render.client.test.tsx b/apps/web/src/components/settings/automations/AutomationsSettings.render.client.test.tsx
index 95829df36..af56b35be 100644
--- a/apps/web/src/components/settings/automations/AutomationsSettings.render.client.test.tsx
+++ b/apps/web/src/components/settings/automations/AutomationsSettings.render.client.test.tsx
@@ -110,6 +110,9 @@ const state = vi.hoisted(() => ({
     slackChannelAccessWarnings: Record<string, unknown>;
     slackChannelDisplayNames: Record<string, unknown>;
   } | null,
+  realSettingsMutation: null as
+    | ((variables: unknown) => Promise<unknown>)
+    | null,
   settingsQuery: {
     isPending: false,
     data: {
@@ -568,6 +571,7 @@ vi.mock('@tanstack/react-query', () => ({
     ) => void;
     onError?: (...args: unknown[]) => void;
     mutationKind?:
+      | 'updateSettings'
       | 'triggerCustomAutomation'
       | 'setCustomAutomationWebhookEnabled'
       | 'rotateCustomAutomationWebhook'
@@ -575,6 +579,19 @@ vi.mock('@tanstack/react-query', () => ({
       | 'rotateBuiltInAutomationWebhook';
     mutationKey?: unknown[];
   }) => {
+    if (
+      _options?.mutationKind === 'updateSettings' &&
+      state.realSettingsMutation
+    ) {
+      return actualQuery.useMutation({
+        mutationFn: state.realSettingsMutation,
+        onSuccess: (result) =>
+          _options.onSuccess?.(
+            result as NonNullable<typeof state.nextUpdateSettingsResult>,
+          ),
+        onError: (error) => _options.onError?.(error),
+      });
+    }
     return {
       isPending:
         _options?.mutationKind === 'triggerCustomAutomation' &&
@@ -741,7 +758,7 @@ vi.mock('@/trpc/client', () => ({
           mutations.latestSettingsOptions =
             (options as typeof mutations.latestSettingsOptions) ?? null;
 
-          return options ?? {};
+          return { ...options, mutationKind: 'updateSettings' };
         },
       },
       triggerAutomation: {
@@ -1071,6 +1088,7 @@ function setRunnableCustomAutomation(launchCriteria?: string) {
 
 describe('AutomationsSettings', () => {
   beforeEach(() => {
+    state.realSettingsMutation = null;
     vi.useRealTimers();
     vi.clearAllMocks();
     state.nextUpdateSettingsResult = null;
@@ -2065,6 +2083,73 @@ describe('AutomationsSettings', () => {
     );
   });
 
+  it.each([false, true])(
+    'locks schedule editing during a genuine deferred save (open editor: %s) and restores it after failure',
+    async (editorOpen) => {
+      let rejectSave!: (error: Error) => void;
+      state.realSettingsMutation = (variables) => {
+        mutations.updateSettings(variables);
+        return new Promise((_resolve, reject) => {
+          rejectSave = reject;
+        });
+      };
+      state.settingsQuery.data.settings.securityAuditorFrequency = 'off';
+      const client = new QueryClient({
+        defaultOptions: { mutations: { retry: false } },
+      });
+      render(
+        <QueryClientProvider client={client}>
+          <AutomationsSettings />
+        </QueryClientProvider>,
+      );
+      fireEvent.click(
+        await screen.findByRole('button', { name: 'Set up Security Auditor' }),
+      );
+      editSummaryRow('Schedule');
+      fireEvent.click(
+        screen.getByRole('combobox', { name: 'Security Auditor schedule' }),
+      );
+      fireEvent.click(screen.getByRole('option', { name: 'On-demand' }));
+      if (editorOpen) editSummaryRow('Schedule');
+      fireEvent.click(screen.getByRole('button', { name: 'Save' }));
+      await waitFor(() =>
+        expect(
+          screen.getByRole('button', { name: 'Saving...' }),
+        ).toBeDisabled(),
+      );
+      expect(mutations.updateSettings).toHaveBeenCalledWith(
+        expect.objectContaining({
+          savingAutomation: 'securityAuditor',
+          securityAuditorFrequency: 'on_demand',
+        }),
+      );
+      const scheduleControl = editorOpen
+        ? screen.getByRole('combobox', { name: 'Security Auditor schedule' })
+        : within(screen.getByText('Schedule:').parentElement!).getByRole(
+            'button',
+            { name: 'Edit' },
+          );
+      expect(scheduleControl).toBeDisabled();
+      await act(async () => {
+        rejectSave(new Error('Synthetic save failure'));
+      });
+      await waitFor(() =>
+        expect(screen.getByRole('button', { name: 'Save' })).toBeEnabled(),
+      );
+      expect(scheduleControl).toBeEnabled();
+      if (!editorOpen) editSummaryRow('Schedule');
+      expect(
+        screen.getByRole('combobox', { name: 'Security Auditor schedule' }),
+      ).toHaveTextContent('On-demand');
+      fireEvent.click(
+        screen.getByRole('combobox', { name: 'Security Auditor schedule' }),
+      );
+      fireEvent.click(screen.getByRole('option', { name: 'Weekly' }));
+      expect(screen.getByText('Weekly', { exact: true })).toBeVisible();
+      client.clear();
+    },
+  );
+
   it('disables a scheduled automation directly', async () => {
     state.settingsQuery.data.settings.managerStatsFrequency = 'weekly' as never;
     render(<AutomationsSettings />);
diff --git a/apps/web/src/components/settings/automations/AutomationsSettings.tsx b/apps/web/src/components/settings/automations/AutomationsSettings.tsx
index 7b47203a7..4e475a862 100644
--- a/apps/web/src/components/settings/automations/AutomationsSettings.tsx
+++ b/apps/web/src/components/settings/automations/AutomationsSettings.tsx
@@ -3807,7 +3807,7 @@ export function AutomationsSettings({
                     details={automationUi.details}
                     frequency={frequency}
                     isEnabled={isEnabled}
-                    disabled={false}
+                    disabled={isAutomationSaving(automation.id)}
                     fieldId={fieldId}
                     onFrequencyChange={(nextFrequency) =>
                       setScheduleOnlyAutomationFrequency(
@@ -4111,7 +4111,7 @@ export function AutomationsSettings({
                     details={automationUi.details}
                     frequency={frequency}
                     isEnabled={isEnabled}
-                    disabled={false}
+                    disabled={isAutomationSaving(automation.id)}
                     fieldId={fieldId}
                     onFrequencyChange={(nextFrequency) =>
                       setScheduleOnlyAutomationFrequency(
@@ -4439,7 +4439,7 @@ export function AutomationsSettings({
                     details={automationUi.details}
                     frequency={frequency}
                     isEnabled={isEnabled}
-                    disabled={false}
+                    disabled={isAutomationSaving(automation.id)}
                     fieldId={fieldId}
                     onFrequencyChange={(nextFrequency) =>
                       setScheduleOnlyAutomationFrequency(
diff --git a/apps/web/src/components/settings/automations/ScheduleOnlyAutomationContent.tsx b/apps/web/src/components/settings/automations/ScheduleOnlyAutomationContent.tsx
index 8c3a4777c..171b2412c 100644
--- a/apps/web/src/components/settings/automations/ScheduleOnlyAutomationContent.tsx
+++ b/apps/web/src/components/settings/automations/ScheduleOnlyAutomationContent.tsx
@@ -157,6 +157,7 @@ export function ScheduleOnlyAutomationContent({
       ) : editingSchedule ? (
         <div className="space-y-2">
           <Select
+            disabled={disabled}
             value={frequency}
             onValueChange={(value) => {
               onFrequencyChange(
@@ -192,6 +193,7 @@ export function ScheduleOnlyAutomationContent({
         </div>
       ) : (
         <SettingSummaryRow
+          disabled={disabled}
           icon={Calendar}
           label="Schedule"
           value={