2 files changed, 8 insertions, 7 deletions
diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx
index e8a060ee..cbd7dd88 100644
--- a/src/screens/badge/BadgeSelection.tsx
+++ b/src/screens/badge/BadgeSelection.tsx
@@ -33,6 +33,7 @@ type BadgeSelectionProps = {
 };
 
 const BadgeSelection: React.FC<BadgeSelectionProps> = ({route}) => {
+  const {editing} = route.params;
   const {userId: loggedInUserId} = useSelector(
     (state: RootState) => state.user.user,
   );
@@ -53,7 +54,9 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({route}) => {
         setSelectedBadges(extractedBadgeNames);
       }
     };
-    loadData();
+    if (editing) {
+      loadData();
+    }
   }, []);
 
   navigation.setOptions({
@@ -61,7 +64,7 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({route}) => {
       <TouchableOpacity
         style={styles.rightButtonContainer}
         onPress={async () => {
-          if (route?.params.editing) {
+          if (editing) {
             updateBadgesService(selectedBadges);
             navigation.navigate('UpdateSPPicture', {
               editing: true,
@@ -78,9 +81,7 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({route}) => {
           }
         }}>
         <Text style={styles.rightButton}>
-          {selectedBadges.length !== 0 || route?.params.editing
-            ? 'Done'
-            : 'Skip'}
+          {selectedBadges.length !== 0 || editing ? 'Done' : 'Skip'}
         </Text>
       </TouchableOpacity>
     ),
diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
index 0c34e90c..cb0a6417 100644
--- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
+++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
@@ -94,7 +94,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC<SuggestedPeopleUploadPictureS
       if (success) {
         dispatch(uploadedSuggestedPeoplePhoto(image));
         if (!editing) {
-          navigation.push('BadgeSelection');
+          navigation.push('BadgeSelection', {editing: false});
         }
       } else {
         Alert.alert(ERROR_UPLOAD);
@@ -165,7 +165,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC<SuggestedPeopleUploadPictureS
             </View>
             <TouchableOpacity
               onPress={() => {
-                navigation.push('BadgeSelection');
+                navigation.push('BadgeSelection', {editing: false});
               }}>
               <FrontArrow style={styles.rightArrow} />
             </TouchableOpacity>