2 files changed, 5 insertions, 1 deletions
diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx
index a3f302d1..f1cd000c 100644
--- a/src/screens/badge/BadgeSelection.tsx
+++ b/src/screens/badge/BadgeSelection.tsx
@@ -44,6 +44,8 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({navigation}) => {
         onPress={() => {
           if (canSubmit) {
             uploadUserSelection();
+          } else {
+            dispatch(suggestedPeopleBadgesFinished());
           }
         }}>
         <Text style={styles.rightButton}>{canSubmit ? 'Done' : 'Skip'}</Text>
diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
index bb8aaccf..92f862c4 100644
--- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
+++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
@@ -76,7 +76,9 @@ const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => {
       const success = await sendSuggestedPeoplePhoto(image);
       if (success) {
         dispatch(uploadedSuggestedPeoplePhoto(image));
-        navigation.push('BadgeSelection');
+        if (goTo !== 'Profile') {
+          navigation.push('BadgeSelection');
+        }
       } else {
         Alert.alert(ERROR_UPLOAD);
       }