diff --git a/src/frontend/App.tsx b/src/frontend/App.tsx
index c9bfb09ec..37190235f 100644
--- a/src/frontend/App.tsx
+++ b/src/frontend/App.tsx
@@ -19,6 +19,7 @@ import {
   LocalDiscoveryProvider,
   createLocalDiscoveryController,
 } from './contexts/LocalDiscoveryContext';
+import {Loading} from './sharedComponents/Loading';
 
 const queryClient = new QueryClient();
 const messagePort = new MessagePortLike();
@@ -56,7 +57,9 @@ const App = () => {
               <ActiveProjectProvider>
                 <PhotoPromiseProvider>
                   <SecurityProvider>
-                    <AppNavigator permissionAsked={permissionsAsked} />
+                    <React.Suspense fallback={<Loading />}>
+                      <AppNavigator permissionAsked={permissionsAsked} />
+                    </React.Suspense>
                   </SecurityProvider>
                 </PhotoPromiseProvider>
               </ActiveProjectProvider>
diff --git a/src/frontend/Navigation/AppNavigator.tsx b/src/frontend/Navigation/AppNavigator.tsx
index d83d564f5..5d77c8908 100644
--- a/src/frontend/Navigation/AppNavigator.tsx
+++ b/src/frontend/Navigation/AppNavigator.tsx
@@ -11,8 +11,17 @@ import {useIntl} from 'react-intl';
 import BootSplash from 'react-native-bootsplash';
 import {useDeviceInfo} from '../hooks/server/deviceInfo';
 import {Loading} from '../sharedComponents/Loading';
-import {createDeviceNamingScreens} from './ScreenGroups/DeviceNamingScreens';
+import {
+  DeviceNamingSceens,
+  createDeviceNamingScreens,
+} from './ScreenGroups/DeviceNamingScreens';
 import {usePrefetchLastKnownLocation} from '../hooks/useLastSavedLocation';
+import {usePersistedDraftObservation} from '../hooks/persistedState/usePersistedDraftObservation';
+import {ClientGeneratedObservation} from '../sharedTypes';
+import {Observation, Preset} from '@mapeo/schema';
+import {matchPreset} from '../lib/utils';
+import {AppList} from './ScreenGroups/AppScreens';
+import {usePresetsQuery} from '../hooks/server/presets';
 
 // import {devExperiments} from '../lib/DevExperiments';
 
@@ -34,7 +43,10 @@ import {usePrefetchLastKnownLocation} from '../hooks/useLastSavedLocation';
 
 export const AppNavigator = ({permissionAsked}: {permissionAsked: boolean}) => {
   const {formatMessage} = useIntl();
-
+  const existingObservation = usePersistedDraftObservation(
+    store => store.value,
+  );
+  const {data: presets} = usePresetsQuery();
   const deviceInfo = useDeviceInfo();
   usePrefetchLastKnownLocation();
 
@@ -48,14 +60,44 @@ export const AppNavigator = ({permissionAsked}: {permissionAsked: boolean}) => {
   }
 
   return (
-    <React.Suspense fallback={<Loading />}>
-      <RootStack.Navigator
-        initialRouteName="IntroToCoMapeo"
-        screenOptions={NavigatorScreenOptions}>
-        {deviceInfo.data && deviceInfo.data.name
-          ? createDefaultScreenGroup(formatMessage)
-          : createDeviceNamingScreens(formatMessage)}
-      </RootStack.Navigator>
-    </React.Suspense>
+    <RootStack.Navigator
+      initialRouteName={getInitialRouteName({
+        hasDeviceName: !!deviceInfo.data?.name,
+        existingObservation,
+        presets,
+      })}
+      screenOptions={NavigatorScreenOptions}>
+      {deviceInfo.data?.name
+        ? createDefaultScreenGroup(formatMessage)
+        : createDeviceNamingScreens(formatMessage)}
+    </RootStack.Navigator>
   );
 };
+
+function getInitialRouteName(
+  initialInfo:
+    | {hasDeviceName: false}
+    | {
+        hasDeviceName: true;
+        existingObservation: null | ClientGeneratedObservation | Observation;
+        presets: Preset[];
+      },
+): keyof AppList | keyof DeviceNamingSceens {
+  // if user has not set a name, navigate to intro screen where they will be prompted to set a name
+  if (!initialInfo.hasDeviceName) {
+    return 'IntroToCoMapeo';
+  }
+
+  // if no exisiting observation, navigate to home
+  if (!initialInfo.existingObservation) {
+    return 'Home';
+  }
+
+  // if existing observation and no preset match, user has started creating an observation but had not chosen a preset, so navigate to preset chooser
+  if (!matchPreset(initialInfo.existingObservation.tags, initialInfo.presets)) {
+    return 'PresetChooser';
+  }
+
+  // if existing observation and preset match, navigate to observation edit
+  return 'ObservationEdit';
+}
diff --git a/src/frontend/screens/ObservationEdit/SaveButton.tsx b/src/frontend/screens/ObservationEdit/SaveButton.tsx
index 1ff1c5622..c3632111f 100644
--- a/src/frontend/screens/ObservationEdit/SaveButton.tsx
+++ b/src/frontend/screens/ObservationEdit/SaveButton.tsx
@@ -12,6 +12,7 @@ import {useEditObservation} from '../../hooks/server/observations';
 import {UIActivityIndicator} from 'react-native-indicators';
 import {useCreateBlobMutation} from '../../hooks/server/media';
 import {DraftPhoto, Photo} from '../../contexts/PhotoPromiseContext/types';
+import {useDraftObservation} from '../../hooks/useDraftObservation';
 
 const m = defineMessages({
   noGpsTitle: {
@@ -66,6 +67,7 @@ export const SaveButton = ({
 }) => {
   const value = usePersistedDraftObservation(store => store.value);
   const photos = usePersistedDraftObservation(store => store.photos);
+  const {clearDraft} = useDraftObservation();
   const {formatMessage: t} = useIntl();
   const navigation = useNavigationFromRoot();
   const createObservationMutation = useCreateObservation();
@@ -85,6 +87,7 @@ export const SaveButton = ({
             if (openErrorModal) openErrorModal();
           },
           onSuccess: () => {
+            clearDraft();
             navigation.navigate('Home', {screen: 'Map'});
           },
         },
@@ -125,6 +128,7 @@ export const SaveButton = ({
               if (openErrorModal) openErrorModal();
             },
             onSuccess: () => {
+              clearDraft();
               navigation.navigate('Home', {screen: 'Map'});
             },
           },
@@ -140,9 +144,16 @@ export const SaveButton = ({
     if (!observationId) throw new Error('Need an observation Id to edit');
     if (!('versionId' in value))
       throw new Error('Cannot update a unsaved observation (must create one)');
-    // @ts-expect-error
-    editObservationMutation.mutate({id: observationId, value});
-    navigation.pop();
+    editObservationMutation.mutate(
+      // @ts-expect-error
+      {id: observationId, value},
+      {
+        onSuccess: () => {
+          clearDraft();
+          navigation.pop();
+        },
+      },
+    );
   }
 
   const confirmationOptions: AlertButton[] = [
diff --git a/src/frontend/screens/PresetChooser.tsx b/src/frontend/screens/PresetChooser.tsx
index ec7104911..c3e834066 100644
--- a/src/frontend/screens/PresetChooser.tsx
+++ b/src/frontend/screens/PresetChooser.tsx
@@ -47,10 +47,10 @@ export const PresetChooser: NativeNavigationComponent<'PresetChooser'> = ({
   React.useLayoutEffect(() => {
     navigation.setOptions({
       headerLeft: props =>
-        prevRouteNameInStack === 'Home' ? (
-          <CustomHeaderLeftClose headerBackButtonProps={props} />
-        ) : (
+        prevRouteNameInStack === 'ObservationEdit' ? (
           <CustomHeaderLeft headerBackButtonProps={props} />
+        ) : (
+          <CustomHeaderLeftClose headerBackButtonProps={props} />
         ),
     });
   }, [prevRouteNameInStack, CustomHeaderLeft, CustomHeaderLeftClose]);
diff --git a/src/frontend/sharedComponents/CustomHeaderLeftClose.tsx b/src/frontend/sharedComponents/CustomHeaderLeftClose.tsx
index 903294f77..53fce6bba 100644
--- a/src/frontend/sharedComponents/CustomHeaderLeftClose.tsx
+++ b/src/frontend/sharedComponents/CustomHeaderLeftClose.tsx
@@ -100,7 +100,9 @@ const HeaderBackNewObservation = ({
         text: t(m.discardConfirm),
         onPress: () => {
           clearDraft();
-          navigation.dispatch(CommonActions.navigate('Home', {screen: 'map'}));
+          navigation.dispatch(
+            CommonActions.reset({index: 0, routes: [{name: 'Home'}]}),
+          );
         },
       },
       {text: t(m.discardCancel), onPress: () => {}},