diff --git a/core/query.go b/core/query.go
index 34768dd8b..26277400d 100644
--- a/core/query.go
+++ b/core/query.go
@@ -190,7 +190,11 @@ func (self *Service) CatQueryStepHandler(msg *db.Message) {
 		for _, r := range rank_list {
 			pair_list = append(pair_list, *r.Pair)
 		}
-		result = pair_list[:qs.N]
+		if len(pair_list) > 0 && len(pair_list) > qs.N {
+			result = pair_list[:qs.N]
+		} else {
+			result = pair_list
+		}
 	} else {
 		result = "NONE"
 	}