diff --git a/src/renderer/src/components/PassageDetail/PassageDetailMarkVerses.test.tsx b/src/renderer/src/components/PassageDetail/PassageDetailMarkVerses.test.tsx
index cf0028c4..8f09ff81 100644
--- a/src/renderer/src/components/PassageDetail/PassageDetailMarkVerses.test.tsx
+++ b/src/renderer/src/components/PassageDetail/PassageDetailMarkVerses.test.tsx
@@ -130,6 +130,18 @@ jest.mock('./PassageDetailPlayer', () => {
 //   }),
 // }));
 jest.mock('../../utils/logErrorService', () => jest.fn());
+
+const mockMediaFile = {
+  id: 'm1',
+  type: 'mediafile',
+  attributes: { segments: '{}' },
+} as MediaFileD;
+
+jest.mock('../../crud/tryFindRecord', () => ({
+  findRecord: jest.fn((_memory: unknown, table: string, id: string) =>
+    table === 'mediafile' && id === 'm1' ? mockMediaFile : undefined
+  ),
+}));
 jest.mock('../../hoc/SnackBar', () => {
   const actual = jest.requireActual('../../hoc/SnackBar');
   return {
@@ -493,7 +505,32 @@ test('should not add rows including refs already in table', async () => {
   expect(tbody.children.length).toBe(4); // 3 limits (with 3 verse refs) + 1 header
 });
 
-test('shows warning snackbar and blocks autosave when checkRefs has issues', async () => {
+test('autosaves segment markup after debounce when only soft validation warnings', async () => {
+  runTest({ width: 1000 });
+  await waitFor(() =>
+    expect(screen.getByTestId('verse-sheet')).toBeInTheDocument()
+  );
+
+  act(() => {
+    if (mockPlayerAction) {
+      mockPlayerAction(
+        '{"regions":"[{\\"start\\":0,\\"end\\":5},{\\"start\\":5,\\"end\\":9}]"}',
+        false
+      );
+    }
+  });
+
+  await waitFor(
+    () => expect(mockProjectSegmentSave).toHaveBeenCalled(),
+    { timeout: 3000 }
+  );
+  expect(mockShowMessage).not.toHaveBeenCalledWith(
+    expect.anything(),
+    AlertSeverity.Warning
+  );
+});
+
+test('blocks autosave when markup has hard reference errors', async () => {
   jest.useFakeTimers();
   runTest({ width: 1000 });
   const tbody = screen.getByTestId('verse-sheet')?.firstChild?.firstChild
@@ -503,7 +540,7 @@ test('shows warning snackbar and blocks autosave when checkRefs has issues', asy
   act(() => {
     if (mockPlayerAction) {
       mockPlayerAction(
-        '{"regions":"[{\\"start\\":0,\\"end\\":5},{\\"start\\":5,\\"end\\":9}]"}',
+        '{"regions":"[{\\"start\\":0,\\"end\\":5,\\"label\\":\\"9:9\\"}]"}',
         false
       );
     }
@@ -516,12 +553,6 @@ test('shows warning snackbar and blocks autosave when checkRefs has issues', asy
     );
   });
 
-  const messageArg = mockShowMessage.mock.calls[0][0] as {
-    props: { children: unknown[] };
-  };
-  const messageText = JSON.stringify(messageArg);
-  expect(messageText).toMatch(/Autosave skipped: \d+ issue\(s\) found\./);
-
   act(() => {
     jest.advanceTimersByTime(2000);
   });
diff --git a/src/renderer/src/components/PassageDetail/PassageDetailMarkVerses.tsx b/src/renderer/src/components/PassageDetail/PassageDetailMarkVerses.tsx
index 51a50a57..d5dab1e8 100644
--- a/src/renderer/src/components/PassageDetail/PassageDetailMarkVerses.tsx
+++ b/src/renderer/src/components/PassageDetail/PassageDetailMarkVerses.tsx
@@ -63,9 +63,13 @@ import {
   isMarkVersesTableRowCompleted,
   isMarkVersesTableTailIncomplete,
 } from '../../utils/markVersesSegmentColors';
+import {
+  getMarkVersesAutosaveBlockers,
+  getMarkVersesValidationIssues,
+} from '../../utils/markVersesValidation';
+import { verseToolId } from './markVersesTool';
 
 const NotTable = 490;
-const verseToolId = 'VerseTool';
 /** Nudge past a join when seeking so the playhead lands in the right-hand segment. */
 const SEGMENT_BOUNDARY_TOLERANCE_SEC = 0.1;
 /** Table limits use one decimal; waveform uses float seconds — allow rounding drift. */
@@ -334,49 +338,77 @@ export function PassageDetailMarkVerses({ width }: MarkVersesProps) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [passage, engVrs]);
 
+  const setStepCompleteRef = useRef(setStepComplete);
+  setStepCompleteRef.current = setStepComplete;
+  const gotoNextStepRef = useRef(gotoNextStep);
+  gotoNextStepRef.current = gotoNextStep;
+  const currentstepRef = useRef(currentstep);
+  currentstepRef.current = currentstep;
+
   const handleComplete = (complete: boolean) => {
     waitForSave(undefined, 200).finally(async () => {
-      await setStepComplete(currentstep, complete);
-      if (complete) gotoNextStep();
+      await setStepCompleteRef.current(currentstepRef.current, complete);
+      if (complete) gotoNextStepRef.current();
     });
   };
 
+  const syncSegmentsRefFromTable = () => {
+    const regions: IRegion[] = [];
+    dataRef.current.forEach((r, i) => {
+      if (i > 0) {
+        const limits = `${r[ColName.Limits]?.value ?? ''}`.split('-');
+        if (limits.length === 2) {
+          regions.push({
+            start: parseFloat(limits[0]),
+            end: parseFloat(limits[1]),
+            label: `${r[ColName.Ref]?.value ?? ''}`,
+          });
+        }
+      }
+    });
+    segmentsRef.current = JSON.stringify({ regions });
+  };
+
   const writeResources = async () => {
     if (!savingRef.current) {
       savingRef.current = true;
-      if (media) {
-        // update all three segment types: verse, transcription, backtranslation
-        let segments = updateSegments(
-          NamedRegions.Transcription,
-          updateSegments(
-            NamedRegions.Verse,
-            media.attributes?.segments,
-            segmentsRef.current
-          ),
+      syncSegmentsRefFromTable();
+      if (!media) {
+        savingRef.current = false;
+        saveCompleted(verseToolId);
+        return;
+      }
+      // update all three segment types: verse, transcription, backtranslation
+      let segments = updateSegments(
+        NamedRegions.Transcription,
+        updateSegments(
+          NamedRegions.Verse,
+          media.attributes?.segments,
+          segmentsRef.current
+        ),
+        segmentsRef.current
+      );
+      if (!hasBtRecordings) {
+        segments = updateSegments(
+          NamedRegions.BackTranslation,
+          segments,
           segmentsRef.current
         );
-        if (!hasBtRecordings) {
-          segments = updateSegments(
-            NamedRegions.BackTranslation,
-            segments,
-            segmentsRef.current
-          );
-        }
-        // remove TRTask segments that handle AI transcription
-        segments = updateSegments(NamedRegions.TRTask, segments, '');
-        projectSegmentSave({ media, segments })
-          .then(() => {
-            saveCompleted(verseToolId);
-          })
-          .catch((err) => {
-            saveCompleted(verseToolId, err.message);
-          })
-          .finally(() => {
-            savingRef.current = false;
-            canceling.current = false;
-            setComplete(0);
-          });
       }
+      // remove TRTask segments that handle AI transcription
+      segments = updateSegments(NamedRegions.TRTask, segments, '');
+      projectSegmentSave({ media, segments })
+        .then(() => {
+          saveCompleted(verseToolId);
+        })
+        .catch((err) => {
+          saveCompleted(verseToolId, err.message);
+        })
+        .finally(() => {
+          savingRef.current = false;
+          canceling.current = false;
+          setComplete(0);
+        });
     }
   };
 
@@ -756,51 +788,23 @@ export function PassageDetailMarkVerses({ width }: MarkVersesProps) {
     else showMessage(tt.noData.replace('{0}', t.markVerses));
   };
 
-  useEffect(() => {
-    if (saveRequested(verseToolId) && !savingRef.current) writeResources();
-    else if (clearRequested(verseToolId)) clearCompleted(verseToolId);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [toolsChanged]);
+  const validationInput = () => ({
+    rows: dataRef.current
+      .filter((_, i) => i > 0)
+      .map((row) => ({
+        limits: `${(row[ColName.Limits] as ICell).value ?? ''}`,
+        ref: `${(row[ColName.Ref] as ICell).value ?? ''}`,
+      })),
+    expandedRefs: collectRefs(dataRef.current),
+    passageRefs: passageRefs.current,
+    hasBtRecordings,
+    strings: t,
+  });
 
-  const checkRefs = () => {
-    const refs: string[] = collectRefs(dataRef.current);
-    const noSegRefs = dataRef.current
-      .filter((v, i) => i > 0)
-      .filter(
-        (v) =>
-          (v[ColName.Ref] as ICell).value && !(v[ColName.Limits] as ICell).value
-      )
-      .map((v) => (v[ColName.Ref] as ICell).value);
-    const noRefSegs = dataRef.current
-      .filter((v, i) => i > 0)
-      .some(
-        (v) =>
-          !(v[ColName.Ref] as ICell).value && (v[ColName.Limits] as ICell).value
-      );
-    const matchAll = refs.every((r) => refMatch(r));
-    const refSet = new Set(passageRefs.current);
-    const outsideRefs = new Set<string>();
-    refs.forEach((r) => {
-      if (refSet.has(r)) refSet.delete(r);
-      else if (refMatch(r)) outsideRefs.add(r);
-    });
-    const issues: string[] = [];
-    if (!matchAll) issues.push(t.badReferences);
-    if (noSegRefs.length > 0)
-      issues.push(t.noSegments.replace('{0}', noSegRefs.join(', ')));
-    if (refSet.size > 0)
-      issues.push(
-        t.missingReferences.replace('{0}', Array.from(refSet).sort().join(', '))
-      );
-    if (outsideRefs.size > 0) {
-      issues.push(
-        t.outsideReferences.replace('{0}', Array.from(outsideRefs).join(', '))
-      );
-    }
-    if (noRefSegs) issues.push(t.noReferences);
-    if (hasBtRecordings) issues.push(t.btNotUpdated);
-    return issues;
-  };
+  const checkRefs = () => getMarkVersesValidationIssues(validationInput());
+
+  const checkAutosaveBlockers = () =>
+    getMarkVersesAutosaveBlockers(validationInput());
 
   const handleCancel = () => {
     if (savingRef.current) {
@@ -832,13 +836,23 @@ export function PassageDetailMarkVerses({ width }: MarkVersesProps) {
     [scheduleAutosave]
   );
 
+  useEffect(() => {
+    if (saveRequested(verseToolId) && !savingRef.current) {
+      scheduleAutosave.clear();
+      void writeResourcesRef.current();
+    } else if (clearRequested(verseToolId)) clearCompleted(verseToolId);
+    // saveRequested/clearRequested read live UnsavedContext refs via toolsChanged
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [toolsChanged, scheduleAutosave]);
+
   useEffect(() => {
     if (!isChanged(verseToolId) || !hasPermission || savingRef.current) return;
-    const issues = checkRefs();
-    if (issues.length > 0) {
+    const allIssues = checkRefs();
+    const blockers = checkAutosaveBlockers();
+    setSaveIssues(allIssues);
+    if (blockers.length > 0) {
       scheduleAutosave.clear();
-      setSaveIssues(issues);
-      const fingerprint = issues.join('\0');
+      const fingerprint = blockers.join('\0');
       if (fingerprint !== lastIssuesNotifyRef.current) {
         lastIssuesNotifyRef.current = fingerprint;
         showMessage(
@@ -851,7 +865,7 @@ export function PassageDetailMarkVerses({ width }: MarkVersesProps) {
             }}
           >
             <span>
-              {t.autosaveSkipped.replace('{0}', String(issues.length))}
+              {t.autosaveSkipped.replace('{0}', String(blockers.length))}
             </span>
             <Button
               size="small"
@@ -867,8 +881,9 @@ export function PassageDetailMarkVerses({ width }: MarkVersesProps) {
       return;
     }
     lastIssuesNotifyRef.current = '';
-    setSaveIssues([]);
-    setIssuesDialogOpen(false);
+    if (allIssues.length === 0) {
+      setIssuesDialogOpen(false);
+    }
     scheduleAutosave();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [toolsChanged, hasPermission, scheduleAutosave]);
diff --git a/src/renderer/src/components/PassageDetail/PassageDetailStepComplete.tsx b/src/renderer/src/components/PassageDetail/PassageDetailStepComplete.tsx
index f9d93e65..3569cb75 100644
--- a/src/renderer/src/components/PassageDetail/PassageDetailStepComplete.tsx
+++ b/src/renderer/src/components/PassageDetail/PassageDetailStepComplete.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { useGlobal } from '../../context/useGlobal';
 import { IconButton, Box, Typography } from '@mui/material';
 import CompleteIcon from '@mui/icons-material/CheckBoxOutlined';
@@ -13,6 +13,9 @@ import { useLocation } from 'react-router-dom';
 import { useStepPermissions } from '../../utils/useStepPermission';
 import { ToolSlug, useStepTool } from '../../crud';
 import { useMobile } from '../../utils';
+import { UnsavedContext } from '../../context/UnsavedContext';
+import { verseToolId } from './markVersesTool';
+import { useSnackBar } from '../../hoc/SnackBar';
 
 export const PassageDetailStepComplete = () => {
   const {
@@ -24,7 +27,6 @@ export const PassageDetailStepComplete = () => {
     gotoNextStep,
     psgCompleted,
     section,
-    passage,
     recording,
     isBoldWorkflow,
   } = usePassageDetailContext();
@@ -42,6 +44,9 @@ export const PassageDetailStepComplete = () => {
   const passageNavigate = usePassageNavigate(() => {
     setView('');
   }, setCurrentStep);
+  const { isChanged, startSave, waitForSave } =
+    useContext(UnsavedContext).state;
+  const { showMessage } = useSnackBar();
 
   const hasPermission = canDoSectionStep(currentstep, section);
 
@@ -53,11 +58,34 @@ export const PassageDetailStepComplete = () => {
 
   const handleToggleComplete = useCallback(async () => {
     const curStatus = complete;
-    await setStepComplete(currentstep, !complete);
-    //if we're now complete, go to the next step or passage
-    if (!curStatus) gotoNextStep();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [complete, currentstep, passage, section]);
+    const finish = async () => {
+      await setStepComplete(currentstep, !complete);
+      if (!curStatus) gotoNextStep();
+    };
+
+    if (!curStatus && tool === ToolSlug.Verses && isChanged(verseToolId)) {
+      startSave(verseToolId);
+      try {
+        await waitForSave(undefined, 25);
+      } catch (err: unknown) {
+        const message = err instanceof Error ? err.message : String(err);
+        if (message) showMessage(message);
+        return;
+      }
+    }
+
+    await finish();
+  }, [
+    complete,
+    currentstep,
+    tool,
+    isChanged,
+    startSave,
+    waitForSave,
+    setStepComplete,
+    gotoNextStep,
+    showMessage,
+  ]);
 
   const handleSetCompleteTo = async () => {
     setStepCompleteTo(currentstep);
diff --git a/src/renderer/src/components/PassageDetail/markVersesTool.ts b/src/renderer/src/components/PassageDetail/markVersesTool.ts
new file mode 100644
index 00000000..39d81594
--- /dev/null
+++ b/src/renderer/src/components/PassageDetail/markVersesTool.ts
@@ -0,0 +1,2 @@
+/** UnsavedContext tool id for Mark Verses (desktop and mobile). */
+export const verseToolId = 'VerseTool';
diff --git a/src/renderer/src/components/PassageDetail/mobile/MarkVerses/PassageDetailMarkVersesIsMobile.tsx b/src/renderer/src/components/PassageDetail/mobile/MarkVerses/PassageDetailMarkVersesIsMobile.tsx
index 28fa6b21..44e17a80 100644
--- a/src/renderer/src/components/PassageDetail/mobile/MarkVerses/PassageDetailMarkVersesIsMobile.tsx
+++ b/src/renderer/src/components/PassageDetail/mobile/MarkVerses/PassageDetailMarkVersesIsMobile.tsx
@@ -83,8 +83,8 @@ import {
   DELREG_KEY,
 } from '../../../../components/WSAudioPlayerSegment';
 import { useMobile } from '../../../../utils/useMobile';
-
-const verseToolId = 'VerseTool';
+import { getMarkVersesAutosaveBlockers } from '../../../../utils/markVersesValidation';
+import { verseToolId } from '../../markVersesTool';
 const emptySegments = JSON.stringify({ regions: [] });
 /** Distance (seconds) used for Add (must be away from boundaries) and Remove (must be at a join). */
 const SEGMENT_BOUNDARY_TOLERANCE_SEC = 0.1;
@@ -1390,12 +1390,15 @@ export default function PassageDetailMarkVersesIsMobile({
     setCurrentSegment,
   ]);
 
+  const persistSegmentsRef = useRef(persistSegments);
+  persistSegmentsRef.current = persistSegments;
+
   const scheduleAutosave = useMemo(
     () =>
       debounce(() => {
-        void persistSegments();
+        void persistSegmentsRef.current();
       }, AUTOSAVE_DEBOUNCE_MS),
-    [persistSegments]
+    []
   );
 
   useEffect(
@@ -1470,68 +1473,46 @@ export default function PassageDetailMarkVersesIsMobile({
 
   useEffect(() => {
     if (saveRequested(verseToolId) && !savingRef.current) {
-      void persistSegments();
+      scheduleAutosave.clear();
+      void persistSegmentsRef.current();
     } else if (clearRequested(verseToolId)) {
       clearCompleted(verseToolId);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [toolsChanged]);
-
-  const checkRefs = useCallback(() => {
-    const refs = collectRefs(dataRef.current);
-    const noSegRefs = dataRef.current
-      .filter((_, index) => index > 0)
-      .filter(
-        (row) =>
-          (row[ColName.Ref] as ICell).value &&
-          !(row[ColName.Limits] as ICell).value
-      )
-      .map((row) => (row[ColName.Ref] as ICell).value);
-    const noRefSegs = dataRef.current
-      .filter((_, index) => index > 0)
-      .some(
-        (row) =>
-          !(row[ColName.Ref] as ICell).value &&
-          (row[ColName.Limits] as ICell).value
-      );
-    const matchAll = refs.every((ref) => refMatch(ref));
-    const refSet = new Set(passageRefs.current);
-    const outsideRefs = new Set<string>();
+  }, [toolsChanged, scheduleAutosave]);
 
-    refs.forEach((ref) => {
-      if (refSet.has(ref)) {
-        refSet.delete(ref);
-      } else if (refMatch(ref)) {
-        outsideRefs.add(ref);
-      }
-    });
+  const validationInput = useCallback(
+    () => ({
+      rows: dataRef.current
+        .filter((_, index) => index > 0)
+        .map((row) => ({
+          limits: `${(row[ColName.Limits] as ICell).value ?? ''}`,
+          ref: `${(row[ColName.Ref] as ICell).value ?? ''}`,
+        })),
+      expandedRefs: collectRefs(dataRef.current),
+      passageRefs: passageRefs.current,
+      hasBtRecordings,
+      strings: t,
+    }),
+    [collectRefs, hasBtRecordings, t]
+  );
 
-    const nextIssues: string[] = [];
-    if (!matchAll) nextIssues.push(t.badReferences);
-    if (noSegRefs.length > 0) {
-      nextIssues.push(t.noSegments.replace('{0}', noSegRefs.join(', ')));
-    }
-    if (refSet.size > 0) {
-      nextIssues.push(
-        t.missingReferences.replace('{0}', Array.from(refSet).sort().join(', '))
-      );
-    }
-    if (outsideRefs.size > 0) {
-      nextIssues.push(
-        t.outsideReferences.replace('{0}', Array.from(outsideRefs).join(', '))
-      );
-    }
-    if (noRefSegs) nextIssues.push(t.noReferences);
-    if (hasBtRecordings) nextIssues.push(t.btNotUpdated);
-    return nextIssues;
-  }, [collectRefs, t, hasBtRecordings]);
+  const checkAutosaveBlockers = useCallback(
+    () => getMarkVersesAutosaveBlockers(validationInput()),
+    [validationInput]
+  );
 
   useEffect(() => {
     if (!hasChanged || !hasPermission || savingRef.current) return;
-    const issues = checkRefs();
-    if (issues.length > 0) return;
+    if (checkAutosaveBlockers().length > 0) return;
     scheduleAutosave();
-  }, [toolsChanged, hasChanged, hasPermission, scheduleAutosave, checkRefs]);
+  }, [
+    toolsChanged,
+    hasChanged,
+    hasPermission,
+    scheduleAutosave,
+    checkAutosaveBlockers,
+  ]);
 
   const resetSave = () => {
     setResetConfirmOpen(false);
diff --git a/src/renderer/src/components/PassageDetail/mobile/MobileStepComplete.cy.tsx b/src/renderer/src/components/PassageDetail/mobile/MobileStepComplete.cy.tsx
index 62f6b302..52a48b4c 100644
--- a/src/renderer/src/components/PassageDetail/mobile/MobileStepComplete.cy.tsx
+++ b/src/renderer/src/components/PassageDetail/mobile/MobileStepComplete.cy.tsx
@@ -11,6 +11,7 @@ import {
   PassageDetailContext,
   ICtxState,
 } from '../../../context/PassageDetailContext';
+import { UnsavedContext } from '../../../context/UnsavedContext';
 import { PassageD, RoleNames, SectionD } from '../../../model';
 import MobileStepComplete from './MobileStepComplete';
 
@@ -99,6 +100,24 @@ const mockStore = createStore(
   })
 );
 
+const mockUnsavedState = {
+  checkSavedFn: (method: () => void) => method(),
+  t: {} as any,
+  handleSaveConfirmed: () => {},
+  handleSaveRefused: () => {},
+  toolChanged: () => {},
+  startSave: () => {},
+  startClear: () => {},
+  saveCompleted: () => {},
+  clearCompleted: () => {},
+  waitForSave: async () => {},
+  anySaving: () => false as const,
+  saveRequested: () => false as const,
+  clearRequested: () => false as const,
+  isChanged: () => false as const,
+  toolsChanged: {},
+};
+
 const createPassageDetailState = (
   overrides: Partial<ICtxState> = {}
 ): ICtxState =>
@@ -216,11 +235,15 @@ const mountMobileStepComplete = ({
     <Provider store={mockStore}>
       <GlobalProvider init={initialState}>
         <OrbitContext.Provider value={orbitContextValue}>
-          <PassageDetailContext.Provider
-            value={{ state: ctxState, setState: cy.stub() }}
+          <UnsavedContext.Provider
+            value={{ state: mockUnsavedState, setState: cy.stub() }}
           >
-            <MobileStepComplete />
-          </PassageDetailContext.Provider>
+            <PassageDetailContext.Provider
+              value={{ state: ctxState, setState: cy.stub() }}
+            >
+              <MobileStepComplete />
+            </PassageDetailContext.Provider>
+          </UnsavedContext.Provider>
         </OrbitContext.Provider>
       </GlobalProvider>
     </Provider>
diff --git a/src/renderer/src/components/PassageDetail/mobile/MobileStepComplete.tsx b/src/renderer/src/components/PassageDetail/mobile/MobileStepComplete.tsx
index 2abed949..787fe93d 100644
--- a/src/renderer/src/components/PassageDetail/mobile/MobileStepComplete.tsx
+++ b/src/renderer/src/components/PassageDetail/mobile/MobileStepComplete.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useContext, useMemo, useState } from 'react';
 import { useGlobal } from '../../../context/useGlobal';
 import { Box, IconButton, Typography } from '@mui/material';
 import CompleteIcon from '@mui/icons-material/CheckBoxOutlined';
@@ -8,6 +8,10 @@ import { IPassageDetailStepCompleteStrings } from '../../../model';
 import { passageDetailStepCompleteSelector } from '../../../selector';
 import { shallowEqual, useSelector } from 'react-redux';
 import { useStepPermissions } from '../../../utils/useStepPermission';
+import { ToolSlug, useStepTool } from '../../../crud';
+import { UnsavedContext } from '../../../context/UnsavedContext';
+import { verseToolId } from '../markVersesTool';
+import { useSnackBar } from '../../../hoc/SnackBar';
 
 export default function MobileStepComplete() {
   const {
@@ -17,11 +21,14 @@ export default function MobileStepComplete() {
     gotoNextStep,
     psgCompleted,
     section,
-    passage,
     recording,
     isBoldWorkflow,
   } = usePassageDetailContext();
+  const { tool } = useStepTool(currentstep);
   const { canDoSectionStep } = useStepPermissions();
+  const { isChanged, startSave, waitForSave } =
+    useContext(UnsavedContext).state;
+  const { showMessage } = useSnackBar();
   const [busy] = useGlobal('remoteBusy');
   const [importexportBusy] = useGlobal('importexportBusy');
   const [view] = useState('');
@@ -39,10 +46,34 @@ export default function MobileStepComplete() {
 
   const handleToggleComplete = useCallback(async () => {
     const curStatus = complete;
-    await setStepComplete(currentstep, !complete);
-    if (!curStatus) gotoNextStep();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [complete, currentstep, passage, section]);
+    const finish = async () => {
+      await setStepComplete(currentstep, !complete);
+      if (!curStatus) gotoNextStep();
+    };
+
+    if (!curStatus && tool === ToolSlug.Verses && isChanged(verseToolId)) {
+      startSave(verseToolId);
+      try {
+        await waitForSave(undefined, 25);
+      } catch (err: unknown) {
+        const message = err instanceof Error ? err.message : String(err);
+        if (message) showMessage(message);
+        return;
+      }
+    }
+
+    await finish();
+  }, [
+    complete,
+    currentstep,
+    tool,
+    isChanged,
+    startSave,
+    waitForSave,
+    setStepComplete,
+    gotoNextStep,
+    showMessage,
+  ]);
 
   if (isBoldWorkflow) return null;
 
diff --git a/src/renderer/src/utils/markVersesValidation.test.ts b/src/renderer/src/utils/markVersesValidation.test.ts
new file mode 100644
index 00000000..7eb6b3c1
--- /dev/null
+++ b/src/renderer/src/utils/markVersesValidation.test.ts
@@ -0,0 +1,62 @@
+import {
+  getMarkVersesAutosaveBlockers,
+  getMarkVersesValidationIssues,
+} from './markVersesValidation';
+
+const strings = {
+  badReferences: 'ERROR: bad refs',
+  noSegments: 'ERROR: no segment: ({0})',
+  missingReferences: 'Warning: missing ({0})',
+  outsideReferences: 'ERROR: outside ({0})',
+  noReferences: 'Warning: no refs on segments',
+  btNotUpdated: 'WARNING: BT not updated',
+};
+
+describe('markVersesValidation', () => {
+  it('allows autosave when segments lack references (work in progress)', () => {
+    const blockers = getMarkVersesAutosaveBlockers({
+      rows: [
+        { limits: '0.0-5.0', ref: '' },
+        { limits: '5.0-9.0', ref: '' },
+      ],
+      expandedRefs: [],
+      passageRefs: ['1:1', '1:2', '1:3', '1:4'],
+      hasBtRecordings: false,
+      strings,
+    });
+    expect(blockers).toEqual([]);
+  });
+
+  it('blocks autosave on verses outside the passage', () => {
+    const blockers = getMarkVersesAutosaveBlockers({
+      rows: [{ limits: '0.0-5.0', ref: '9:9' }],
+      expandedRefs: ['9:9'],
+      passageRefs: ['1:1'],
+      hasBtRecordings: false,
+      strings,
+    });
+    expect(blockers.some((b) => b.includes('9:9'))).toBe(true);
+  });
+
+  it('includes soft warnings in full issues but not autosave blockers', () => {
+    const issues = getMarkVersesValidationIssues({
+      rows: [{ limits: '0.0-5.0', ref: '' }],
+      expandedRefs: [],
+      passageRefs: ['1:1', '1:2'],
+      hasBtRecordings: true,
+      strings,
+    });
+    expect(issues).toContain(strings.noReferences);
+    expect(issues.some((i) => i.startsWith('Warning: missing'))).toBe(true);
+    expect(issues).toContain(strings.btNotUpdated);
+
+    const blockers = getMarkVersesAutosaveBlockers({
+      rows: [{ limits: '0.0-5.0', ref: '' }],
+      expandedRefs: [],
+      passageRefs: ['1:1', '1:2'],
+      hasBtRecordings: true,
+      strings,
+    });
+    expect(blockers).toEqual([]);
+  });
+});
diff --git a/src/renderer/src/utils/markVersesValidation.ts b/src/renderer/src/utils/markVersesValidation.ts
new file mode 100644
index 00000000..217d719f
--- /dev/null
+++ b/src/renderer/src/utils/markVersesValidation.ts
@@ -0,0 +1,103 @@
+import { refMatch } from './refMatch';
+
+export interface MarkVersesValidationStrings {
+  badReferences: string;
+  noSegments: string;
+  missingReferences: string;
+  outsideReferences: string;
+  noReferences: string;
+  btNotUpdated: string;
+}
+
+export interface MarkVersesValidationRow {
+  limits: string;
+  ref: string;
+}
+
+export interface MarkVersesValidationInput {
+  rows: MarkVersesValidationRow[];
+  /** Verse references expanded from table cells (see Mark Verses collectRefs). */
+  expandedRefs: string[];
+  passageRefs: string[];
+  hasBtRecordings: boolean;
+  strings: MarkVersesValidationStrings;
+}
+
+/** Hard errors that must block persisting segment markup. */
+export const getMarkVersesAutosaveBlockers = (
+  input: MarkVersesValidationInput
+): string[] => {
+  const { rows, expandedRefs: refs, passageRefs, strings: t } = input;
+
+  const passageRefSet = new Set(passageRefs);
+  const noSegRefs = rows
+    .filter((row) => row.ref && !row.limits && !passageRefSet.has(row.ref))
+    .map((row) => row.ref);
+
+  const matchAll = refs.every((r) => refMatch(r));
+  const refSet = new Set(passageRefs);
+  const outsideRefs = new Set<string>();
+  refs.forEach((r) => {
+    if (refSet.has(r)) refSet.delete(r);
+    else if (refMatch(r)) outsideRefs.add(r);
+  });
+
+  const blockers: string[] = [];
+  if (!matchAll) blockers.push(t.badReferences);
+  if (noSegRefs.length > 0) {
+    blockers.push(t.noSegments.replace('{0}', noSegRefs.join(', ')));
+  }
+  if (outsideRefs.size > 0) {
+    blockers.push(
+      t.outsideReferences.replace('{0}', Array.from(outsideRefs).join(', '))
+    );
+  }
+  return blockers;
+};
+
+/** Full markup review list (warnings + errors) for the issues dialog. */
+export const getMarkVersesValidationIssues = (
+  input: MarkVersesValidationInput
+): string[] => {
+  const {
+    rows,
+    expandedRefs: refs,
+    passageRefs,
+    hasBtRecordings,
+    strings: t,
+  } = input;
+
+  const passageRefSet = new Set(passageRefs);
+  const noSegRefs = rows
+    .filter((row) => row.ref && !row.limits && !passageRefSet.has(row.ref))
+    .map((row) => row.ref);
+
+  const noRefSegs = rows.some((row) => !row.ref && row.limits);
+
+  const matchAll = refs.every((r) => refMatch(r));
+  const refSet = new Set(passageRefs);
+  const outsideRefs = new Set<string>();
+  refs.forEach((r) => {
+    if (refSet.has(r)) refSet.delete(r);
+    else if (refMatch(r)) outsideRefs.add(r);
+  });
+
+  const issues: string[] = [];
+  if (!matchAll) issues.push(t.badReferences);
+  if (noSegRefs.length > 0) {
+    issues.push(t.noSegments.replace('{0}', noSegRefs.join(', ')));
+  }
+  if (refSet.size > 0) {
+    issues.push(
+      t.missingReferences.replace('{0}', Array.from(refSet).sort().join(', '))
+    );
+  }
+  if (outsideRefs.size > 0) {
+    issues.push(
+      t.outsideReferences.replace('{0}', Array.from(outsideRefs).join(', '))
+    );
+  }
+  if (noRefSegs) issues.push(t.noReferences);
+  if (hasBtRecordings) issues.push(t.btNotUpdated);
+  return issues;
+};