diff --git a/pkg/models/task_search.go b/pkg/models/task_search.go
index eab5155325f..3085319cafc 100644
--- a/pkg/models/task_search.go
+++ b/pkg/models/task_search.go
@@ -374,11 +374,14 @@ func (t *typesenseTaskSearcher) Search(opts *taskSearchOptions) (tasks []*Task,
 		Q:                opts.search,
 		QueryBy:          "title, identifier, description, comments.comment",
 		Page:             pointer.Int(opts.page),
-		PerPage:          pointer.Int(opts.perPage),
 		ExhaustiveSearch: pointer.True(),
 		FilterBy:         pointer.String(strings.Join(filterBy, " && ")),
 	}
 
+	if opts.perPage > 0 {
+		params.PerPage = pointer.Int(opts.perPage)
+	}
+
 	if sortby != "" {
 		params.SortBy = pointer.String(sortby)
 	}