diff --git a/app/src/organisms/LabwarePositionCheck/FatalErrorModal.tsx b/app/src/organisms/LabwarePositionCheck/FatalErrorModal.tsx
index e6a57928419..a415559e2c4 100644
--- a/app/src/organisms/LabwarePositionCheck/FatalErrorModal.tsx
+++ b/app/src/organisms/LabwarePositionCheck/FatalErrorModal.tsx
@@ -25,69 +25,91 @@ import { WizardHeader } from '../../molecules/WizardHeader'
 import { i18n } from '../../i18n'
 
 const SUPPORT_EMAIL = 'support@opentrons.com'
-
-interface FatalErrorModalProps {
+interface FatalErrorProps {
   errorMessage: string
   shouldUseMetalProbe: boolean
   onClose: () => void
 }
+
+interface FatalErrorModalProps extends FatalErrorProps {
+  isOnDevice: boolean
+}
+
 export function FatalErrorModal(props: FatalErrorModalProps): JSX.Element {
-  const { errorMessage, shouldUseMetalProbe, onClose } = props
   const { t } = useTranslation(['labware_position_check', 'shared', 'branded'])
+  const { onClose, isOnDevice } = props
   return createPortal(
-    <LegacyModalShell
-      width="47rem"
-      header={
+    isOnDevice ? (
+      <LegacyModalShell fullPage>
         <WizardHeader
           title={t('labware_position_check_title')}
           onExit={onClose}
         />
-      }
-    >
-      <Flex
-        padding={SPACING.spacing32}
-        flexDirection={DIRECTION_COLUMN}
-        alignItems={ALIGN_CENTER}
-        justifyContent={JUSTIFY_SPACE_BETWEEN}
-        gridGap={SPACING.spacing16}
+        <FatalError {...props} />
+      </LegacyModalShell>
+    ) : (
+      <LegacyModalShell
+        width="47rem"
+        header={
+          <WizardHeader
+            title={t('labware_position_check_title')}
+            onExit={onClose}
+          />
+        }
       >
-        <Icon
-          name="ot-alert"
-          size="2.5rem"
-          color={COLORS.red50}
-          aria-label="alert"
-        />
-        <ErrorHeader>
-          {i18n.format(t('shared:something_went_wrong'), 'sentenceCase')}
-        </ErrorHeader>
-        {shouldUseMetalProbe ? (
-          <LegacyStyledText
-            as="p"
-            fontWeight={TYPOGRAPHY.fontWeightSemiBold}
-            textAlign={TEXT_ALIGN_CENTER}
-          >
-            {t('remove_probe_before_exit')}
-          </LegacyStyledText>
-        ) : null}
-        <LegacyStyledText as="p" textAlign={TEXT_ALIGN_CENTER}>
-          {t('branded:help_us_improve_send_error_report', {
-            support_email: SUPPORT_EMAIL,
-          })}
-        </LegacyStyledText>
-        <ErrorTextArea readOnly value={errorMessage ?? ''} spellCheck={false} />
-        <PrimaryButton
-          textTransform={TEXT_TRANSFORM_CAPITALIZE}
-          alignSelf={ALIGN_FLEX_END}
-          onClick={onClose}
-        >
-          {t('shared:exit')}
-        </PrimaryButton>
-      </Flex>
-    </LegacyModalShell>,
+        <FatalError {...props} />
+      </LegacyModalShell>
+    ),
     getTopPortalEl()
   )
 }
 
+export function FatalError(props: FatalErrorProps): JSX.Element {
+  const { errorMessage, shouldUseMetalProbe, onClose } = props
+  const { t } = useTranslation(['labware_position_check', 'shared', 'branded'])
+  return (
+    <Flex
+      padding={SPACING.spacing32}
+      flexDirection={DIRECTION_COLUMN}
+      alignItems={ALIGN_CENTER}
+      justifyContent={JUSTIFY_SPACE_BETWEEN}
+      gridGap={SPACING.spacing16}
+    >
+      <Icon
+        name="ot-alert"
+        size="2.5rem"
+        color={COLORS.red50}
+        aria-label="alert"
+      />
+      <ErrorHeader>
+        {i18n.format(t('shared:something_went_wrong'), 'sentenceCase')}
+      </ErrorHeader>
+      {shouldUseMetalProbe ? (
+        <LegacyStyledText
+          as="p"
+          fontWeight={TYPOGRAPHY.fontWeightSemiBold}
+          textAlign={TEXT_ALIGN_CENTER}
+        >
+          {t('remove_probe_before_exit')}
+        </LegacyStyledText>
+      ) : null}
+      <LegacyStyledText as="p" textAlign={TEXT_ALIGN_CENTER}>
+        {t('branded:help_us_improve_send_error_report', {
+          support_email: SUPPORT_EMAIL,
+        })}
+      </LegacyStyledText>
+      <ErrorTextArea readOnly value={errorMessage ?? ''} spellCheck={false} />
+      <PrimaryButton
+        textTransform={TEXT_TRANSFORM_CAPITALIZE}
+        alignSelf={ALIGN_FLEX_END}
+        onClick={onClose}
+      >
+        {t('shared:exit')}
+      </PrimaryButton>
+    </Flex>
+  )
+}
+
 const ErrorHeader = styled.h1`
   text-align: ${TEXT_ALIGN_CENTER};
   ${TYPOGRAPHY.h1Default}
diff --git a/app/src/organisms/LabwarePositionCheck/LabwarePositionCheckComponent.tsx b/app/src/organisms/LabwarePositionCheck/LabwarePositionCheckComponent.tsx
index 32662dd7391..c6f91efb66b 100644
--- a/app/src/organisms/LabwarePositionCheck/LabwarePositionCheckComponent.tsx
+++ b/app/src/organisms/LabwarePositionCheck/LabwarePositionCheckComponent.tsx
@@ -25,7 +25,7 @@ import { PickUpTip } from './PickUpTip'
 import { ReturnTip } from './ReturnTip'
 import { ResultsSummary } from './ResultsSummary'
 import { useChainMaintenanceCommands } from '../../resources/runs'
-import { FatalErrorModal } from './FatalErrorModal'
+import { FatalError } from './FatalErrorModal'
 import { RobotMotionLoader } from './RobotMotionLoader'
 import { useNotifyCurrentMaintenanceRun } from '../../resources/maintenance_runs'
 import { getLabwarePositionCheckSteps } from './getLabwarePositionCheckSteps'
@@ -334,10 +334,10 @@ export const LabwarePositionCheckComponent = (
     )
   } else if (fatalError != null) {
     modalContent = (
-      <FatalErrorModal
+      <FatalError
         errorMessage={fatalError}
         shouldUseMetalProbe={shouldUseMetalProbe}
-        onClose={handleCleanUpAndClose}
+        onClose={onCloseClick}
       />
     )
   } else if (showConfirmation) {
@@ -414,18 +414,12 @@ export const LabwarePositionCheckComponent = (
   const wizardHeader = (
     <WizardHeader
       title={t('labware_position_check_title')}
-      currentStep={currentStepIndex}
-      totalSteps={totalStepCount}
+      currentStep={fatalError != null ? undefined : currentStepIndex}
+      totalSteps={fatalError != null ? undefined : totalStepCount}
       onExit={
-        showConfirmation || isExiting
+        showConfirmation || isExiting || fatalError != null
           ? undefined
-          : () => {
-              if (fatalError != null) {
-                handleCleanUpAndClose()
-              } else {
-                confirmExitLPC()
-              }
-            }
+          : confirmExitLPC
       }
     />
   )
diff --git a/app/src/organisms/LabwarePositionCheck/index.tsx b/app/src/organisms/LabwarePositionCheck/index.tsx
index abadfa346a1..5648913cfe2 100644
--- a/app/src/organisms/LabwarePositionCheck/index.tsx
+++ b/app/src/organisms/LabwarePositionCheck/index.tsx
@@ -2,6 +2,8 @@ import * as React from 'react'
 import { useLogger } from '../../logger'
 import { LabwarePositionCheckComponent } from './LabwarePositionCheckComponent'
 import { FatalErrorModal } from './FatalErrorModal'
+import { getIsOnDevice } from '../../redux/config'
+import { useSelector } from 'react-redux'
 
 import { FLEX_ROBOT_TYPE } from '@opentrons/shared-data'
 import type {
@@ -31,12 +33,14 @@ export const LabwarePositionCheck = (
   props: LabwarePositionCheckModalProps
 ): JSX.Element => {
   const logger = useLogger(new URL('', import.meta.url).pathname)
+  const isOnDevice = useSelector(getIsOnDevice)
   return (
     <ErrorBoundary
       logger={logger}
       ErrorComponent={FatalErrorModal}
       shouldUseMetalProbe={props.robotType === FLEX_ROBOT_TYPE}
       onClose={props.onCloseClick}
+      isOnDevice={isOnDevice}
     >
       <LabwarePositionCheckComponent {...props} />
     </ErrorBoundary>
@@ -52,7 +56,9 @@ interface ErrorBoundaryProps {
     errorMessage: string
     shouldUseMetalProbe: boolean
     onClose: () => void
+    isOnDevice: boolean
   }) => JSX.Element
+  isOnDevice: boolean
 }
 class ErrorBoundary extends React.Component<
   ErrorBoundaryProps,
@@ -74,7 +80,12 @@ class ErrorBoundary extends React.Component<
   }
 
   render(): ErrorBoundaryProps['children'] | JSX.Element {
-    const { ErrorComponent, children, shouldUseMetalProbe } = this.props
+    const {
+      ErrorComponent,
+      children,
+      shouldUseMetalProbe,
+      isOnDevice,
+    } = this.props
     const { error } = this.state
     if (error != null)
       return (
@@ -82,6 +93,7 @@ class ErrorBoundary extends React.Component<
           errorMessage={error.message}
           shouldUseMetalProbe={shouldUseMetalProbe}
           onClose={this.props.onClose}
+          isOnDevice={isOnDevice}
         />
       )
     // Normally, just render children