diff --git a/pkg/models/resources/resources.go b/pkg/models/resources/resources.go
index c1186648dc6a507616cebccb30eb9e23bc18ee31..d23fffd5b5c0b60f522692261cb165026530b7db 100644
--- a/pkg/models/resources/resources.go
+++ b/pkg/models/resources/resources.go
@@ -160,10 +160,13 @@ func ListResources(namespace, resource string, conditions *params.Conditions, or
 		return nil, err
 	}
 
-	for i, item := range result {
-		if i >= offset && (limit == -1 || len(items) < limit) {
-			items = append(items, injector.addExtraAnnotations(item))
-		}
+	if limit == -1 || limit+offset > len(result) {
+		limit = len(result) - offset
+	}
+
+	result = result[offset : offset+limit]
+	for _, item := range result {
+		items = append(items, injector.addExtraAnnotations(item))
 	}
 
 	return &models.PageableResponse{TotalCount: len(result), Items: items}, nil