diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php
index cee1bb7f3..fae860265 100644
--- a/modules/comment/comment.item.php
+++ b/modules/comment/comment.item.php
@@ -440,7 +440,7 @@ class CommentItem extends BaseObject
 		return false;
 	}
 
-	function getContentPlainText($strlen = 0)
+	function getContentPlainText($strlen = 0, $default_content = '')
 	{
 		if($this->isDeletedByAdmin())
 		{
@@ -465,7 +465,20 @@ class CommentItem extends BaseObject
 		{
 			$content = cut_str($content, $strlen, '...');
 		}
-		return escape($content);
+
+		$content = escape($content);
+
+		if ($content === '')
+		{
+			return $default_content;
+		}
+
+		if ($content === '0')
+		{
+			return '0';
+		}
+
+		return $content;
 	}
 
 	/**
@@ -563,7 +576,7 @@ class CommentItem extends BaseObject
 	 * Return summary content
 	 * @return string
 	 */
-	function getSummary($str_size = 50, $tail = '...')
+	function getSummary($str_size = 50, $tail = '...', $default_content = '')
 	{
 		// Remove tags
 		$content = $this->getContent(false, false);
@@ -578,8 +591,19 @@ class CommentItem extends BaseObject
 
 		// Truncate string
 		$content = cut_str($content, $str_size, $tail);
+		$content = escape($content);
 
-		return escape($content);
+		if ($content === '')
+		{
+			return $default_content;
+		}
+
+		if ($content === '0')
+		{
+			return '0';
+		}
+
+		return $content;
 	}
 
 	function getRegdate($format = 'Y.m.d H:i:s', $conversion = true)
diff --git a/modules/member/m.skins/default/comment_list.html b/modules/member/m.skins/default/comment_list.html
index 025e6ad86..b0006258c 100644
--- a/modules/member/m.skins/default/comment_list.html
+++ b/modules/member/m.skins/default/comment_list.html
@@ -4,7 +4,7 @@
 	<ul class="lt">
 		<li loop="$comment_list => $no,$comment">
 			<a href="{getUrl('','document_srl',$comment->document_srl)}#comment_{$comment->comment_srl}" target="_blank">
-				{$comment->getSummary() === "0" ? "0" : ($comment->getSummary() ?: $lang->msg_no_text_comment)}
+				{$comment->getSummary(50, '...', $lang->msg_no_text_comment)}
 				<span class="memberInfo">{$comment->getRegdate("Y-m-d")}</span>
 			</a>
 		</li>
diff --git a/modules/member/skins/default/comment_list.html b/modules/member/skins/default/comment_list.html
index 9ad9cb4e9..ebd6e707f 100644
--- a/modules/member/skins/default/comment_list.html
+++ b/modules/member/skins/default/comment_list.html
@@ -16,7 +16,7 @@
 			<td>{$no}</td>
 			<td>
 				<a href="{getUrl('','document_srl',$comment->document_srl)}#comment_{$comment->comment_srl}" target="_blank">
-					{$comment->getSummary() === "0" ? "0" : ($comment->getSummary() ?: $lang->msg_no_text_comment)}
+					{$comment->getSummary(50, '...', $lang->msg_no_text_comment)}
 				</a>
 			</td>
 			<td>{$comment->getRegdate("Y-m-d")}</td>