diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php
index 8c915711..948e716c 100644
--- a/web/lib/pkgfuncs.inc.php
+++ b/web/lib/pkgfuncs.inc.php
@@ -624,6 +624,10 @@ function pkg_search_page($params, $show_headers=true, $SID="") {
 		$params['O'] = 0;
 	}
 
+	if($params['O'] >= 2500){
+		$params['O'] = 2500;
+	}
+
 	if (isset($params["PP"])) {
 		$params["PP"] = bound(intval($params["PP"]), 50, 250);
 	} else {
@@ -772,6 +776,9 @@ function pkg_search_page($params, $show_headers=true, $SID="") {
 	if ($result_t) {
 		$row = $result_t->fetch(PDO::FETCH_NUM);
 		$total = $row[0];
+		if ($total >= 2500) {
+			$total = 2500;
+		}
 	}
 	else {
 		$total = 0;