diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index dd432979238..08e8450c8c0 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -760,6 +760,7 @@ issues.due_date_overdue = "Overdue"
 issues.review.approve = "approved these changes %s"
 issues.review.comment = "left review comments %s"
 issues.review.reject = "rejected these changes %s"
+issues.review.pending = Pending
 
 pulls.desc = Enable merge requests and code reviews.
 pulls.new = New Pull Request
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index e232b77b33d..a9100e56065 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -707,7 +707,7 @@ func ViewIssue(ctx *context.Context) {
 				return
 			}
 		} else if comment.Type == models.CommentTypeCode || comment.Type == models.CommentTypeReview {
-			if err = comment.LoadReview(); err != nil {
+			if err = comment.LoadReview(); err != nil && !models.IsErrReviewNotExist(err) {
 				ctx.ServerError("LoadReview", err)
 				return
 			}
diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl
index e5702cfba84..f777d51b18a 100644
--- a/templates/repo/diff/comments.tmpl
+++ b/templates/repo/diff/comments.tmpl
@@ -9,15 +9,9 @@
 		<div class="ui top attached header">
 			<span class="text grey"><a {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.Name}}</a> {{$.root.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}</span>
 			<div class="ui right actions">
-			{{if gt .ShowTag 0}}
-				<div class="item tag">
-				{{if eq .ShowTag 1}}
-									{{$.root.i18n.Tr "repo.issues.poster"}}
-								{{else if eq .ShowTag 2}}
-									{{$.root.i18n.Tr "repo.issues.collaborator"}}
-								{{else if eq .ShowTag 3}}
-									{{$.root.i18n.Tr "repo.issues.owner"}}
-								{{end}}
+			{{if eq .Review.Type 0}}
+				<div class="item warning tag">
+						{{$.root.i18n.Tr "repo.issues.review.pending"}}
 				</div>
 			{{end}}
 			{{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.root.RepoLink .ID) }}