diff --git a/kallithea/controllers/changeset.py b/kallithea/controllers/changeset.py
--- a/kallithea/controllers/changeset.py
+++ b/kallithea/controllers/changeset.py
@@ -241,7 +241,8 @@ class ChangesetController(BaseRepoContro
                 comments.update((st.changeset_comment_id, st.comment)
                                 for st in ChangesetStatusModel()
                                 .get_statuses(c.db_repo.repo_id,
-                                              changeset.raw_id, with_revisions=True))
+                                              changeset.raw_id, with_revisions=True)
+                                if st.changeset_comment_id is not None)
 
                 inlines = ChangesetCommentsModel()\
                             .get_inline_comments(c.db_repo.repo_id,