diff --git a/webapp/components/Comment.spec.js b/webapp/components/Comment.spec.js
index 23e72f9d6..375280cea 100644
--- a/webapp/components/Comment.spec.js
+++ b/webapp/components/Comment.spec.js
@@ -63,6 +63,7 @@ describe('Comment.vue', () => {
         propsData.comment = {
           id: '2',
           contentExcerpt: 'Hello I am a comment content',
+          content: 'Hello I am comment content',
         }
       })
 
diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue
index e4df37693..3b2170661 100644
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment.vue
@@ -38,18 +38,14 @@
       <div v-show="!openEditCommentMenu">
         <div v-if="isCollapsed" v-html="comment.contentExcerpt" style="padding-left: 40px;" />
         <div
-          v-show="comment.content !== comment.contentExcerpt"
+          v-show="comment.content !== comment.contentExcerpt && comment.content.length > 180"
           style="text-align: right;  margin-right: 20px; margin-top: -12px;"
         >
           <a v-if="isCollapsed" style="padding-left: 40px;" @click="isCollapsed = !isCollapsed">
             {{ $t('comment.show.more') }}
           </a>
         </div>
-        <content-viewer
-          v-if="!isCollapsed"
-          :content="comment.content"
-          style="padding-left: 40px;"
-        />
+        <content-viewer v-if="!isCollapsed" v-html="comment.content" style="padding-left: 40px;" />
         <div style="text-align: right;  margin-right: 20px; margin-top: -12px;">
           <a v-if="!isCollapsed" @click="isCollapsed = !isCollapsed" style="padding-left: 40px; ">
             {{ $t('comment.show.less') }}
diff --git a/webapp/components/CommentList/CommentList.spec.js b/webapp/components/CommentList/CommentList.spec.js
index 5551227a1..0fa1e8b81 100644
--- a/webapp/components/CommentList/CommentList.spec.js
+++ b/webapp/components/CommentList/CommentList.spec.js
@@ -27,7 +27,9 @@ describe('CommentList.vue', () => {
       propsData = {
         post: {
           id: 1,
-          comments: [{ id: 'comment134', contentExcerpt: 'this is a comment' }],
+          comments: [
+            { id: 'comment134', contentExcerpt: 'this is a comment', content: 'this is a comment' },
+          ],
         },
       }
       store = new Vuex.Store({