diff --git a/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunSetup.tsx b/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunSetup.tsx
index 3204293a7cc1..00abf0f53cb0 100644
--- a/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunSetup.tsx
+++ b/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunSetup.tsx
@@ -64,6 +64,7 @@ import { SetupStep } from './SetupStep'
 import { EmptySetupStep } from './EmptySetupStep'
 import { LearnAboutOffsetsLink } from './LearnAboutOffsetsLink'
 import { useLPCFlows } from '/app/organisms/LabwarePositionCheck'
+import { useUpdateClientLPC } from '/app/resources/client_data'
 
 import type { RefObject } from 'react'
 import type { Dispatch, State } from '/app/redux/types'
@@ -129,6 +130,7 @@ export function ProtocolRunSetup({
   const flexOffsetsMissing = useSelector(
     selectIsAnyNecessaryDefaultOffsetMissing(runId)
   )
+  const { updateWithRunId: updateLPCStatusWithRunId } = useUpdateClientLPC()
   const flexOffsetsApplied = useSelector(selectAreOffsetsApplied(runId))
   const noLwOffsetsInRun =
     useSelector(selectTotalCountLocationSpecificOffsets(runId)) === 0 && isFlex
@@ -275,6 +277,7 @@ export function ProtocolRunSetup({
           setOffsetsConfirmed={confirmed => {
             if (confirmed) {
               dispatch(appliedOffsetsToRun(runId))
+              updateLPCStatusWithRunId(runId)
 
               setExpandedStepKey(LABWARE_SETUP_STEP_KEY)
             }
diff --git a/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/__tests__/useHandleClientAppliedOffsets.test.ts b/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/__tests__/useHandleClientAppliedOffsets.test.ts
index 6f8be4d1b9b2..daffd45d8010 100644
--- a/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/__tests__/useHandleClientAppliedOffsets.test.ts
+++ b/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/__tests__/useHandleClientAppliedOffsets.test.ts
@@ -6,10 +6,7 @@ import {
   useClientDataLPC,
   useUpdateClientLPC,
 } from '/app/resources/client_data/'
-import {
-  appliedOffsetsToRun,
-  selectAreOffsetsApplied,
-} from '/app/redux/protocol-runs'
+import { appliedOffsetsToRun } from '/app/redux/protocol-runs'
 import { useIsRunCurrent } from '/app/resources/runs'
 
 vi.mock('react-redux')
@@ -24,7 +21,6 @@ describe('useHandleClientAppliedOffsets', () => {
 
   const mockDispatch = vi.fn()
   const mockClearClientData = vi.fn()
-  const mockUpdateWithRunId = vi.fn()
 
   beforeEach(() => {
     vi.clearAllMocks()
@@ -40,10 +36,6 @@ describe('useHandleClientAppliedOffsets', () => {
       (runId: string | null) => false
     )
 
-    vi.mocked(
-      selectAreOffsetsApplied
-    ).mockImplementation((runId: string) => (state: any) => false)
-
     vi.mocked(useClientDataLPC).mockReturnValue({
       runId: null,
       userId: null,
@@ -51,7 +43,6 @@ describe('useHandleClientAppliedOffsets', () => {
 
     vi.mocked(useUpdateClientLPC).mockReturnValue({
       clearClientData: mockClearClientData,
-      updateWithRunId: mockUpdateWithRunId,
     } as any)
 
     vi.mocked(useSelector).mockImplementation(selector => {
@@ -74,7 +65,6 @@ describe('useHandleClientAppliedOffsets', () => {
     })
 
     expect(mockClearClientData).not.toHaveBeenCalled()
-    expect(mockUpdateWithRunId).not.toHaveBeenCalled()
     expect(mockDispatch).not.toHaveBeenCalled()
   })
 
@@ -90,7 +80,6 @@ describe('useHandleClientAppliedOffsets', () => {
     })
 
     expect(mockClearClientData).toHaveBeenCalledTimes(1)
-    expect(mockUpdateWithRunId).not.toHaveBeenCalled()
     expect(mockDispatch).not.toHaveBeenCalled()
   })
 
@@ -106,15 +95,11 @@ describe('useHandleClientAppliedOffsets', () => {
     })
 
     expect(mockClearClientData).toHaveBeenCalledTimes(1)
-    expect(mockUpdateWithRunId).not.toHaveBeenCalled()
     expect(mockDispatch).not.toHaveBeenCalled()
   })
 
-  it('should update client data when offsets are applied locally but not by another user', () => {
+  it('should not take any action when run IDs match but no user ID is present', () => {
     vi.mocked(useIsRunCurrent).mockReturnValue(true)
-    vi.mocked(
-      selectAreOffsetsApplied
-    ).mockImplementation((runId: string) => (state: any) => true)
     vi.mocked(useClientDataLPC).mockReturnValue({
       runId: RUN_ID,
       userId: null,
@@ -125,15 +110,11 @@ describe('useHandleClientAppliedOffsets', () => {
     })
 
     expect(mockClearClientData).not.toHaveBeenCalled()
-    expect(mockUpdateWithRunId).toHaveBeenCalledWith(RUN_ID)
     expect(mockDispatch).not.toHaveBeenCalled()
   })
 
-  it('should dispatch applied offsets when offsets are applied by another user but not locally', () => {
+  it('should dispatch applied offsets when run IDs match and user ID is present', () => {
     vi.mocked(useIsRunCurrent).mockReturnValue(true)
-    vi.mocked(
-      selectAreOffsetsApplied
-    ).mockImplementation((runId: string) => (state: any) => false)
     vi.mocked(useClientDataLPC).mockReturnValue({
       runId: RUN_ID,
       userId: USER_ID,
@@ -144,15 +125,26 @@ describe('useHandleClientAppliedOffsets', () => {
     })
 
     expect(mockClearClientData).not.toHaveBeenCalled()
-    expect(mockUpdateWithRunId).not.toHaveBeenCalled()
     expect(mockDispatch).toHaveBeenCalledWith(appliedOffsetsToRun(RUN_ID))
   })
 
-  it('should do nothing when run is current, client data has the same run ID, and offsets are already applied', () => {
+  it('should not dispatch applied offsets when run IDs do not match, even if user ID is present', () => {
+    vi.mocked(useIsRunCurrent).mockReturnValue(true)
+    vi.mocked(useClientDataLPC).mockReturnValue({
+      runId: OTHER_RUN_ID,
+      userId: USER_ID,
+    })
+
+    renderHook(() => {
+      useHandleClientAppliedOffsets(RUN_ID)
+    })
+
+    expect(mockClearClientData).toHaveBeenCalledTimes(1)
+    expect(mockDispatch).not.toHaveBeenCalled()
+  })
+
+  it('should do nothing when run is current, client data has the same run ID and user ID, and offsets are already applied', () => {
     vi.mocked(useIsRunCurrent).mockReturnValue(true)
-    vi.mocked(
-      selectAreOffsetsApplied
-    ).mockImplementation((runId: string) => (state: any) => true)
     vi.mocked(useClientDataLPC).mockReturnValue({
       runId: RUN_ID,
       userId: USER_ID,
@@ -163,11 +155,10 @@ describe('useHandleClientAppliedOffsets', () => {
     })
 
     expect(mockClearClientData).not.toHaveBeenCalled()
-    expect(mockUpdateWithRunId).not.toHaveBeenCalled()
-    expect(mockDispatch).not.toHaveBeenCalled()
+    expect(mockDispatch).toHaveBeenCalledWith(appliedOffsetsToRun(RUN_ID))
   })
 
-  it('should call clearClientData with null thisRunId when not current', () => {
+  it('should call clearClientData when not current with null thisRunId', () => {
     vi.mocked(useIsRunCurrent).mockReturnValue(false)
     vi.mocked(useClientDataLPC).mockReturnValue({
       runId: null,
@@ -178,19 +169,15 @@ describe('useHandleClientAppliedOffsets', () => {
       useHandleClientAppliedOffsets(null)
     })
 
-    expect(mockClearClientData).toHaveBeenCalledTimes(1)
-    expect(mockUpdateWithRunId).not.toHaveBeenCalled()
+    expect(mockClearClientData).toHaveBeenCalled()
     expect(mockDispatch).not.toHaveBeenCalled()
   })
 
-  it('should call updateWithRunId with null thisRunId when current and offsets applied', () => {
+  it('should dispatch when run is current with null thisRunId and user ID is present', () => {
     vi.mocked(useIsRunCurrent).mockReturnValue(true)
-    vi.mocked(
-      selectAreOffsetsApplied
-    ).mockImplementation((runId: string) => (state: any) => true)
     vi.mocked(useClientDataLPC).mockReturnValue({
       runId: null,
-      userId: null,
+      userId: USER_ID,
     })
 
     renderHook(() => {
@@ -198,7 +185,6 @@ describe('useHandleClientAppliedOffsets', () => {
     })
 
     expect(mockClearClientData).not.toHaveBeenCalled()
-    expect(mockUpdateWithRunId).toHaveBeenCalledWith(null)
     expect(mockDispatch).not.toHaveBeenCalled()
   })
 })
diff --git a/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/useHandleClientAppliedOffsets.ts b/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/useHandleClientAppliedOffsets.ts
index 8cf32c07b128..aa0008cd9fdc 100644
--- a/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/useHandleClientAppliedOffsets.ts
+++ b/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/useHandleClientAppliedOffsets.ts
@@ -1,13 +1,10 @@
-import { useDispatch, useSelector } from 'react-redux'
+import { useDispatch } from 'react-redux'
 import { useEffect } from 'react'
 import {
   useClientDataLPC,
   useUpdateClientLPC,
 } from '/app/resources/client_data/'
-import {
-  appliedOffsetsToRun,
-  selectAreOffsetsApplied,
-} from '/app/redux/protocol-runs'
+import { appliedOffsetsToRun } from '/app/redux/protocol-runs'
 import { useIsRunCurrent } from '/app/resources/runs'
 
 const CLIENT_DATA_INTERVAL_MS = 5000
@@ -15,12 +12,9 @@ const CLIENT_DATA_INTERVAL_MS = 5000
 // Keep the applied offset state in sync between various apps using the same robot.
 export function useHandleClientAppliedOffsets(thisRunId: string | null): void {
   const dispatch = useDispatch()
-  const areOffsetsApplied = useSelector(
-    selectAreOffsetsApplied(thisRunId ?? '')
-  )
   const isThisRunCurrent = useIsRunCurrent(thisRunId)
 
-  const { clearClientData, updateWithRunId } = useUpdateClientLPC()
+  const { clearClientData } = useUpdateClientLPC()
   const { runId: clientDataRunId, userId: clientDataUserId } = useClientDataLPC(
     {
       refetchInterval: CLIENT_DATA_INTERVAL_MS,
@@ -32,14 +26,10 @@ export function useHandleClientAppliedOffsets(thisRunId: string | null): void {
       if (clientDataRunId !== thisRunId && clientDataRunId != null) {
         clearClientData()
       }
-      // Offsets applied locally but not by another user - update client data
-      else if (areOffsetsApplied && clientDataUserId == null) {
-        updateWithRunId(thisRunId)
-      }
       // Offsets applied by another user but not locally - mark as applied locally
       else if (
         clientDataUserId != null &&
-        !areOffsetsApplied &&
+        clientDataRunId === thisRunId &&
         thisRunId != null
       ) {
         dispatch(appliedOffsetsToRun(thisRunId))
@@ -49,11 +39,5 @@ export function useHandleClientAppliedOffsets(thisRunId: string | null): void {
         clearClientData()
       }
     }
-  }, [
-    isThisRunCurrent,
-    clientDataRunId,
-    areOffsetsApplied,
-    clientDataUserId,
-    thisRunId,
-  ])
+  }, [isThisRunCurrent, clientDataRunId, clientDataUserId, thisRunId])
 }
diff --git a/app/src/organisms/ODD/ProtocolSetup/ProtocolSetupOffsets/SetupOffsetsHeader.tsx b/app/src/organisms/ODD/ProtocolSetup/ProtocolSetupOffsets/SetupOffsetsHeader.tsx
index 4daf993143d5..09d705f23784 100644
--- a/app/src/organisms/ODD/ProtocolSetup/ProtocolSetupOffsets/SetupOffsetsHeader.tsx
+++ b/app/src/organisms/ODD/ProtocolSetup/ProtocolSetupOffsets/SetupOffsetsHeader.tsx
@@ -18,6 +18,7 @@ import {
 } from '/app/redux/protocol-runs'
 import { useAddLabwareOffsetToRunMutation } from '@opentrons/react-api-client'
 import { useState } from 'react'
+import { useUpdateClientLPC } from '/app/resources/client_data'
 
 export function SetupOffsetsHeader({
   runId,
@@ -32,6 +33,7 @@ export function SetupOffsetsHeader({
     selectIsAnyNecessaryDefaultOffsetMissing(runId)
   )
   const lwOffsetsForRun = useSelector(selectLabwareOffsetsToAddToRun(runId))
+  const { updateWithRunId } = useUpdateClientLPC()
 
   const [isApplyOffsets, setIsApplyingOffsets] = useState(false)
 
@@ -48,6 +50,7 @@ export function SetupOffsetsHeader({
         )
           .then(() => {
             dispatch(appliedOffsetsToRun(runId))
+            updateWithRunId(runId)
             setSetupScreen('prepare to run')
           })
           .catch(() => {