diff --git a/src/components/postElements/body/view/commentBodyView.tsx b/src/components/postElements/body/view/commentBodyView.tsx
index 52b518d5e..730816e4d 100644
--- a/src/components/postElements/body/view/commentBodyView.tsx
+++ b/src/components/postElements/body/view/commentBodyView.tsx
@@ -335,6 +335,7 @@ const CommentBody = ({
             <PostHtmlRenderer
               contentWidth={_contentWidth}
               body={body}
+              isComment={true}
               onElementIsImage={_onElementIsImage}
               setSelectedImage={_handleSetSelectedImage}
               setSelectedLink={_handleSetSelectedLink}
diff --git a/src/components/postHtmlRenderer/postHtmlRenderer.tsx b/src/components/postHtmlRenderer/postHtmlRenderer.tsx
index a66dfdff9..eacb47841 100644
--- a/src/components/postHtmlRenderer/postHtmlRenderer.tsx
+++ b/src/components/postHtmlRenderer/postHtmlRenderer.tsx
@@ -6,13 +6,12 @@ import VideoThumb from './videoThumb';
 import { AutoHeightImage } from '../autoHeightImage/autoHeightImage';
 import { useHtmlIframeProps, iframeModel } from '@native-html/iframe-plugin';
 import WebView from 'react-native-webview';
-import { View } from 'react-native';
-import YoutubeIframe from 'react-native-youtube-iframe';
 import { VideoPlayer } from '..';
 
 interface PostHtmlRendererProps {
   contentWidth: number;
   body: string;
+  isComment?: boolean;
   onLoaded?: () => void;
   setSelectedImage: (imgUrl: string) => void;
   setSelectedLink: (url: string) => void;
@@ -28,6 +27,7 @@ export const PostHtmlRenderer = memo(
   ({
     contentWidth,
     body,
+    isComment,
     onLoaded,
     setSelectedImage,
     setSelectedLink,
@@ -133,35 +133,42 @@ export const PostHtmlRenderer = memo(
         _handleOnLinkPress(data);
       };
       
-      if (tnode.classes?.indexOf('markdown-video-link-youtube') >= 0) {
-        return (
-          <VideoPlayer
-            contentWidth={contentWidth}
-            youtubeVideoId={parsedTnode.youtubeId}
-            startTime={parsedTnode.startTime}
-          />
-        );
-      }
-      if (tnode.classes?.indexOf('markdown-video-link') >= 0) {
-        return (
-          <VideoPlayer
-            contentWidth={contentWidth}
-            videoUrl={parsedTnode.videoHref}
-          />
-        );
-      }
-      if (tnode.classes?.indexOf('markdown-video-link') >= 0) {
-        const imgElement = tnode.children.find((child) => {
-          return child.classes.indexOf('video-thumbnail') > 0 ? true : false;
-        });
-        if (!imgElement) {
-          return <VideoThumb contentWidth={contentWidth} onPress={_onPress} />;
+
+      //process video link
+      if(tnode.classes?.indexOf('markdown-video-link') >= 0){
+        if(isComment){
+          const imgElement = tnode.children.find((child) => {
+            return child.classes.indexOf('video-thumbnail') > 0 ? true : false;
+          });
+          if (!imgElement) {
+            return <VideoThumb contentWidth={contentWidth} onPress={_onPress} />;
+          }
+        }
+        else if(tnode.classes?.indexOf('markdown-video-link-youtube') >= 0){
+          return (
+            <VideoPlayer
+              mode='youtube'
+              contentWidth={contentWidth}
+              youtubeVideoId={parsedTnode.youtubeId}
+              startTime={parsedTnode.startTime}
+            />
+          );
+        } else {
+          return (
+            <VideoPlayer
+              mode='url'
+              contentWidth={contentWidth}
+              videoUrl={parsedTnode.videoHref}
+            />
+          );
         }
       }
 
+
       return <InternalRenderer tnode={tnode} onPress={_onPress} {...props} />;
     };
 
+
     //this method checks if image is a child of table column
     //and calculates img width accordingly,
     //returns full width if img is not part of table