1 files changed, 14 insertions, 4 deletions
diff --git a/src/components/moments/MomentPost.tsx b/src/components/moments/MomentPost.tsx
index 1ab7c1fa..e2875b9a 100644
--- a/src/components/moments/MomentPost.tsx
+++ b/src/components/moments/MomentPost.tsx
@@ -46,11 +46,17 @@ const MomentPost: React.FC<MomentPostProps> = ({item, userXId, screenType}) => {
    * Check if loggedInUser has been tagged in the picture and set the id
    */
   useEffect(() => {
-    tags.forEach((tag) => {
-      if (tag.user.id === loggedInUserId) {
-        setMomentTagId(tag.id);
+    const getMomentTagId = () => {
+      const ownTag: MomentTagType[] = tags.filter(
+        (tag) => tag.user.id === loggedInUserId,
+      );
+      if (ownTag?.length > 0) {
+        setMomentTagId(ownTag[0].id);
+      } else {
+        setMomentTagId('');
       }
-    });
+    };
+    getMomentTagId();
   }, [tags]);
 
   /*
@@ -64,6 +70,10 @@ const MomentPost: React.FC<MomentPostProps> = ({item, userXId, screenType}) => {
     }
   };
 
+  useEffect(() => {
+    console.log('Tags have been altered');
+  }, [tags]);
+
   return (
     <View style={styles.postContainer}>
       <MomentPostHeader