diff --git a/src/components/MyObservations/ToolbarContainer.js b/src/components/MyObservations/ToolbarContainer.js
index 5749b3b33..1855d99b9 100644
--- a/src/components/MyObservations/ToolbarContainer.js
+++ b/src/components/MyObservations/ToolbarContainer.js
@@ -53,12 +53,10 @@ const ToolbarContainer = ( {
       return t( "X-observations-uploaded", { count: totalUploadCount } );
     }
 
-    if ( numUnuploadedObs <= 0 ) {
-      return null;
-    }
-
     if ( !uploadInProgress ) {
-      return t( "Upload-x-observations", { count: numUnuploadedObs } );
+      return numUnuploadedObs !== 0
+        ? t( "Upload-x-observations", { count: numUnuploadedObs } )
+        : "";
     }
 
     const translationParams = {
diff --git a/src/components/ObsEdit/BottomButtons.js b/src/components/ObsEdit/BottomButtons.js
index 51c92cec1..e5d2b369d 100644
--- a/src/components/ObsEdit/BottomButtons.js
+++ b/src/components/ObsEdit/BottomButtons.js
@@ -18,8 +18,6 @@ const DESIRED_LOCATION_ACCURACY = 4000000;
 const BottomButtons = ( ): Node => {
   const { t } = useTranslation( );
   const {
-    saveCurrentObservation,
-    saveAndUploadObservation,
     setNextScreen,
     currentObservation,
     unsavedChanges,
@@ -47,18 +45,10 @@ const BottomButtons = ( ): Node => {
     return false;
   };
 
-  const handleSave = async ( ) => {
+  const handlePress = type => {
     if ( showMissingEvidence( ) ) { return; }
-    setButtonPressed( "save" );
-    await saveCurrentObservation( );
-    setNextScreen( );
-  };
-
-  const handleUpload = async ( ) => {
-    if ( showMissingEvidence( ) ) { return; }
-    setButtonPressed( "upload" );
-    await saveAndUploadObservation( );
-    setNextScreen( );
+    setButtonPressed( type );
+    setNextScreen( { type } );
   };
 
   return (
@@ -76,7 +66,7 @@ const BottomButtons = ( ): Node => {
       {currentObservation?._synced_at
         ? (
           <Button
-            onPress={handleSave}
+            onPress={( ) => handlePress( "save" )}
             testID="ObsEdit.saveChangesButton"
             text={t( "SAVE-CHANGES" )}
             level={unsavedChanges
@@ -93,7 +83,7 @@ const BottomButtons = ( ): Node => {
           >
             <Button
               className="px-[25px]"
-              onPress={handleSave}
+              onPress={( ) => handlePress( "save" )}
               testID="ObsEdit.saveButton"
               text={t( "SAVE" )}
               level="neutral"
@@ -107,7 +97,7 @@ const BottomButtons = ( ): Node => {
                 : "neutral"}
               text={t( "UPLOAD-NOW" )}
               testID="ObsEdit.uploadButton"
-              onPress={handleUpload}
+              onPress={( ) => handlePress( "upload" )}
               loading={buttonPressed === "upload"}
               disabled={buttonPressed !== null}
             />
diff --git a/src/components/SharedComponents/ObservationsFlashList/ObsGridItem.js b/src/components/SharedComponents/ObservationsFlashList/ObsGridItem.js
index fe7d8b6d2..52dd6f48f 100644
--- a/src/components/SharedComponents/ObservationsFlashList/ObsGridItem.js
+++ b/src/components/SharedComponents/ObservationsFlashList/ObsGridItem.js
@@ -14,8 +14,7 @@ type Props = {
   width?: string,
   height?: string,
   style?: Object,
-  setShowLoginSheet: Function,
-  hideUploadStatus?: boolean
+  setShowLoginSheet: Function
 };
 
 const ObsGridItem = ( {
@@ -23,8 +22,7 @@ const ObsGridItem = ( {
   width = "w-full",
   height,
   style,
-  setShowLoginSheet,
-  hideUploadStatus
+  setShowLoginSheet
 }: Props ): Node => (
   <ObsImagePreview
     source={{
@@ -41,15 +39,13 @@ const ObsGridItem = ( {
     testID={`MyObservations.gridItem.${observation.uuid}`}
   >
     <View className="absolute bottom-0 flex p-2 w-full">
-      {!hideUploadStatus && (
-        <ObsUploadStatus
-          observation={observation}
-          layout="horizontal"
-          white
-          classNameMargin="mb-1"
-          setShowLoginSheet={setShowLoginSheet}
-        />
-      )}
+      <ObsUploadStatus
+        observation={observation}
+        layout="horizontal"
+        white
+        classNameMargin="mb-1"
+        setShowLoginSheet={setShowLoginSheet}
+      />
       <DisplayTaxonName
         keyBase={observation?.uuid}
         taxon={observation?.taxon}
diff --git a/src/components/SharedComponents/ObservationsFlashList/ObsUploadStatus.js b/src/components/SharedComponents/ObservationsFlashList/ObsUploadStatus.js
index 2f8020869..bf74a5a4b 100644
--- a/src/components/SharedComponents/ObservationsFlashList/ObsUploadStatus.js
+++ b/src/components/SharedComponents/ObservationsFlashList/ObsUploadStatus.js
@@ -58,11 +58,12 @@ const ObsUploadStatus = ( {
     if ( !observation.id ) {
       const totalProgressIncrements = needsSync( observation ) + obsPhotos;
 
-      if ( typeof currentProgress === "number" ) { return null; }
-      const progress = currentProgress / totalProgressIncrements;
+      const progress = currentProgress === "number"
+        ? currentProgress / totalProgressIncrements
+        : 0;
       return (
         <UploadStatus
-          progress={progress || 0}
+          progress={progress}
           uploadObservation={() => {
             if ( !isConnected ) {
               Alert.alert(
@@ -76,7 +77,7 @@ const ObsUploadStatus = ( {
               setShowLoginSheet( true );
               return;
             }
-            uploadObservation( observation, true );
+            uploadObservation( observation, { isSingleUpload: true } );
           }}
           color={whiteColor}
           completeColor={whiteColor}
diff --git a/src/components/SharedComponents/ObservationsFlashList/ObservationsFlashList.js b/src/components/SharedComponents/ObservationsFlashList/ObservationsFlashList.js
index 98ab5d3d3..18ff5e92c 100644
--- a/src/components/SharedComponents/ObservationsFlashList/ObservationsFlashList.js
+++ b/src/components/SharedComponents/ObservationsFlashList/ObservationsFlashList.js
@@ -25,7 +25,6 @@ type Props = {
   currentUser?: ?Object,
   testID: string,
   handleScroll?: Function,
-  hideUploadStatus?: boolean,
   status?: string,
   showObservationsEmptyScreen?: boolean
 };
@@ -34,8 +33,7 @@ const GUTTER = 15;
 
 const Item = React.memo(
   ( {
-    observation, layout, gridItemWidth, setShowLoginSheet = false,
-    hideUploadStatus
+    observation, layout, gridItemWidth, setShowLoginSheet = false
   } ) => (
     <MyObservationsPressable observation={observation}>
       {
@@ -51,7 +49,6 @@ const Item = React.memo(
                 margin: GUTTER / 2
               }}
               setShowLoginSheet={setShowLoginSheet}
-              hideUploadStatus={hideUploadStatus}
             />
           )
           : (
@@ -74,7 +71,6 @@ const ObservationsFlashList = ( {
   currentUser,
   testID,
   handleScroll,
-  hideUploadStatus,
   status,
   showObservationsEmptyScreen
 }: Props ): Node => {
@@ -127,7 +123,6 @@ const ObservationsFlashList = ( {
       gridItemWidth={gridItemWidth}
       allObsToUpload={allObsToUpload}
       testID={testID}
-      hideUploadStatus={hideUploadStatus}
     />
   );
 
diff --git a/src/providers/ObsEditProvider.js b/src/providers/ObsEditProvider.js
index c1363196d..ad32a5286 100644
--- a/src/providers/ObsEditProvider.js
+++ b/src/providers/ObsEditProvider.js
@@ -372,30 +372,6 @@ const ObsEditProvider = ( { children }: Props ): Node => {
       setObservations( [...updatedObservations] );
     };
 
-    const setNextScreen = ( ) => {
-      if ( observations.length === 1 ) {
-        setCurrentObservationIndex( 0 );
-        setObservations( [] );
-
-        navigation.navigate( "TabNavigator", {
-          screen: "ObservationsStackNavigator",
-          params: {
-            screen: "ObsList"
-          }
-        } );
-      } else if ( currentObservationIndex === observations.length - 1 ) {
-        observations.pop( );
-        setCurrentObservationIndex( observations.length - 1 );
-        setObservations( observations );
-      } else {
-        observations.splice( currentObservationIndex, 1 );
-        setCurrentObservationIndex( currentObservationIndex );
-        // this seems necessary for rerendering the ObsEdit screen
-        setObservations( [] );
-        setObservations( observations );
-      }
-    };
-
     const deleteLocalObservation = uuid => {
       const localObservation = realm.objectForPrimaryKey( "Observation", uuid );
       if ( !localObservation ) { return; }
@@ -510,8 +486,8 @@ const ObsEditProvider = ( { children }: Props ): Node => {
       return responses[0];
     };
 
-    const uploadObservation = async ( obs, isSingleUpload ) => {
-      if ( isSingleUpload ) {
+    const uploadObservation = async ( obs, uploadOptions ) => {
+      if ( uploadOptions?.isSingleUpload ) {
         dispatch( {
           type: "UPLOAD_SINGLE_OBSERVATION",
           observation: obs
@@ -605,9 +581,33 @@ const ObsEditProvider = ( { children }: Props ): Node => {
       return response;
     };
 
-    const saveAndUploadObservation = async ( ) => {
+    const setNextScreen = async ( { type }: Object ) => {
       const savedObservation = await saveCurrentObservation( );
-      return uploadObservation( savedObservation );
+      if ( type === "upload" ) {
+        uploadObservation( savedObservation, { isSingleUpload: true } );
+      }
+
+      if ( observations.length === 1 ) {
+        setCurrentObservationIndex( 0 );
+        setObservations( [] );
+
+        navigation.navigate( "TabNavigator", {
+          screen: "ObservationsStackNavigator",
+          params: {
+            screen: "ObsList"
+          }
+        } );
+      } else if ( currentObservationIndex === observations.length - 1 ) {
+        observations.pop( );
+        setCurrentObservationIndex( observations.length - 1 );
+        setObservations( observations );
+      } else {
+        observations.splice( currentObservationIndex, 1 );
+        setCurrentObservationIndex( currentObservationIndex );
+        // this seems necessary for rerendering the ObsEdit screen
+        setObservations( [] );
+        setObservations( observations );
+      }
     };
 
     const removePhotoFromList = ( list, photo ) => {
@@ -730,7 +730,6 @@ const ObsEditProvider = ( { children }: Props ): Node => {
       addCameraPhotosToCurrentObservation,
       resetObsEditContext,
       saveCurrentObservation,
-      saveAndUploadObservation,
       deleteLocalObservation,
       album,
       setAlbum,