diff --git a/RMuseum/Services/Implementation/GanjoorService.cs b/RMuseum/Services/Implementation/GanjoorService.cs
index 89d88022..38b6632b 100644
--- a/RMuseum/Services/Implementation/GanjoorService.cs
+++ b/RMuseum/Services/Implementation/GanjoorService.cs
@@ -493,6 +493,8 @@ namespace RMuseum.Services.Implementation
 
                 foreach(GanjoorCommentSummaryViewModel comment in allComments)
                 {
+                    comment.AuthorName = comment.AuthorName.ToPersianNumbers().ApplyCorrectYeKe();
+                    comment.HtmlComment = comment.HtmlComment.ToPersianNumbers().ApplyCorrectYeKe();
                     comment.HtmlComment = _Linkify(comment.HtmlComment);
                     comment.HtmlComment = $"<p>{comment.HtmlComment.Replace("\r\n", "\n").Replace("\n\n", "\n").Replace("\n", "<br />".Replace("ي", "ی"))}</p>";
                 }
@@ -567,6 +569,8 @@ namespace RMuseum.Services.Implementation
 
                 foreach (GanjoorCommentFullViewModel comment in paginatedResult.Items)
                 {
+                    comment.AuthorName = comment.AuthorName.ToPersianNumbers().ApplyCorrectYeKe();
+                    comment.HtmlComment = comment.HtmlComment.ToPersianNumbers().ApplyCorrectYeKe();
                     comment.HtmlComment = _Linkify(comment.HtmlComment);
                     comment.HtmlComment = $"<p>{comment.HtmlComment.Replace("\r\n", "\n").Replace("\n\n", "\n").Replace("\n", "<br />".Replace("ي", "ی"))}</p>";
                 }