2 files changed, 6 insertions, 3 deletions
diff --git a/src/components/moments/MomentCommentPreview.tsx b/src/components/moments/MomentCommentPreview.tsx
index e53ed258..232568f1 100644
--- a/src/components/moments/MomentCommentPreview.tsx
+++ b/src/components/moments/MomentCommentPreview.tsx
@@ -23,7 +23,9 @@ const MomentCommentPreview: React.FC<MomentCommentPreviewProps> = ({
   const navigation = useNavigation();
   const state = useStore().getState();
   const commentCountText =
-    commentsCount === 0 ? 'No Comments' : commentsCount + ' comments';
+    !commentsCount || commentsCount === 0
+      ? 'No Comments'
+      : commentsCount + ' comments';
 
   return (
     <TouchableOpacity
@@ -35,7 +37,7 @@ const MomentCommentPreview: React.FC<MomentCommentPreviewProps> = ({
         })
       }>
       <Text style={styles.whiteBold}>{commentCountText}</Text>
-      {commentPreview !== null && (
+      {commentPreview && (
         <View style={styles.previewContainer}>
           <Image
             source={{
@@ -50,7 +52,7 @@ const MomentCommentPreview: React.FC<MomentCommentPreviewProps> = ({
             {renderTextWithMentions({
               value: commentPreview.comment,
               styles: styles.normalFont,
-              partTypes: mentionPartTypes('white'),
+              partTypes: mentionPartTypes('white', 'comment'),
               onPress: (user: UserType) =>
                 navigateToProfile(
                   state,
diff --git a/src/components/moments/MomentPost.tsx b/src/components/moments/MomentPost.tsx
index 0f105c0d..1a0dc981 100644
--- a/src/components/moments/MomentPost.tsx
+++ b/src/components/moments/MomentPost.tsx
@@ -264,6 +264,7 @@ const MomentPost: React.FC<MomentPostProps> = ({
             },
           ]}
           resizeMode={'cover'}
+          ref={imageRef}
         />
         <View
           style={{