diff --git a/pagure/static/issue_ev.js b/pagure/static/issue_ev.js
index eeca6de..1eb0afa 100644
--- a/pagure/static/issue_ev.js
+++ b/pagure/static/issue_ev.js
@@ -210,7 +210,11 @@ update_issue = function(data) {
       } else if (data.issue.status == 'Open'){
           html = '<span class="label label-primary">Open</span>';
       } else {
-          html = '<span class="label label-info">' + data.issue.status + '</span> <small>as: ' + data.issue.close_status + '</small>';
+          html = '<span class="label label-info">' + data.issue.status
+            + '</span>';
+        if (data.issue.close_status) {
+          html += '<small>as: ' + data.issue.close_status + '</small>';
+        }
       }
       field.html(html);
     } else if (_f == 'title'){
diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index 66a79d8..34c21e0 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -139,7 +139,7 @@
                 elif issue.status|lower == 'open' %}label-primary{%
                 else %}label-info{%
                 endif %}">{{ issue.status }}</span>
-                {% if issue.status == 'Closed' %}
+                {% if issue.status == 'Closed' and issue.close_status %}
                 <small>
                 as: {{ issue.close_status }}
                 </small>