1 files changed, 19 insertions, 15 deletions
diff --git a/src/screens/moments/TagFriendsScreen.tsx b/src/screens/moments/TagFriendsScreen.tsx
index 9c78a63e..e6a9f5fb 100644
--- a/src/screens/moments/TagFriendsScreen.tsx
+++ b/src/screens/moments/TagFriendsScreen.tsx
@@ -39,8 +39,10 @@ const TagFriendsScreen: React.FC<TagFriendsScreenProps> = ({route}) => {
    * Update list of tagged users from route params
    */
   useEffect(() => {
-    setTaggedUsers(selectedUsers ? selectedUsers : []);
-  }, [route.params]);
+    if (selectedUsers !== undefined) {
+      setTaggedUsers(selectedUsers);
+    }
+  }, [selectedUsers]);
 
   /*
    * Navigate back to Tag Users Screen, send selected users
@@ -82,19 +84,21 @@ const TagFriendsScreen: React.FC<TagFriendsScreenProps> = ({route}) => {
               source={{uri: image.path}}
               resizeMode={'cover'}
             />
-            <MomentTags
-              editing={true}
-              tags={taggedUsers.map((user) => ({
-                id: '',
-                x: 0,
-                y: 0,
-                user,
-              }))}
-              imageRef={imageRef}
-              deleteFromList={(user) =>
-                setTaggedUsers(taggedUsers.filter((u) => u.id !== user.id))
-              }
-            />
+            {taggedUsers.length !== 0 && (
+              <MomentTags
+                editing={true}
+                tags={taggedUsers.map((user) => ({
+                  id: '',
+                  x: 0,
+                  y: 0,
+                  user,
+                }))}
+                imageRef={imageRef}
+                deleteFromList={(user) =>
+                  setTaggedUsers(taggedUsers.filter((u) => u.id !== user.id))
+                }
+              />
+            )}
             <View style={{marginHorizontal: '5%', marginTop: '3%'}}>
               <TagFriendsFooter
                 taggedUsers={taggedUsers}