diff --git a/db/mapset_ranking_queue_comments.go b/db/mapset_ranking_queue_comments.go
index 884bf75..554adfd 100644
--- a/db/mapset_ranking_queue_comments.go
+++ b/db/mapset_ranking_queue_comments.go
@@ -80,9 +80,15 @@ func (c *MapsetRankingQueueComment) Edit(comment string) error {
 func GetRankingQueueComments(mapsetId int, includePrivate bool) ([]*MapsetRankingQueueComment, error) {
 	var comments = make([]*MapsetRankingQueueComment, 0)
 
-	result := SQL.
+	query := SQL.
 		Joins("User").
-		Where("mapset_id = ? AND is_private = ?", mapsetId, includePrivate).
+		Where("mapset_id = ?", mapsetId)
+
+	if !includePrivate {
+		query = query.Where("is_private = ?", false)
+	}
+
+	result := query.
 		Order("id DESC").
 		Find(&comments)
 
diff --git a/handlers/ranking_comments.go b/handlers/ranking_comments.go
index f23e221..49233cf 100644
--- a/handlers/ranking_comments.go
+++ b/handlers/ranking_comments.go
@@ -35,7 +35,7 @@ func prepareRankingQueueCommentsForResponse(comments []*db.MapsetRankingQueueCom
 	prepared := make([]*db.MapsetRankingQueueComment, 0, len(comments))
 
 	for _, comment := range comments {
-		if !canViewPrivate {
+		if comment.IsPrivate && !canViewPrivate {
 			continue
 		}