diff --git a/raystack/frontier/v1beta1/admin.proto b/raystack/frontier/v1beta1/admin.proto
index 099df1d3..d021bdb8 100644
--- a/raystack/frontier/v1beta1/admin.proto
+++ b/raystack/frontier/v1beta1/admin.proto
@@ -174,7 +174,10 @@ service AdminService {
 message ListAllUsersRequest {
   int32 page_size = 1 [(buf.validate.field) = {
     ignore: IGNORE_IF_ZERO_VALUE
-    int32: {gte: 1}
+    int32: {
+      gte: 1
+      lte: 5000
+    }
   }];
   int32 page_num = 2 [(buf.validate.field) = {
     ignore: IGNORE_IF_ZERO_VALUE
@@ -212,7 +215,10 @@ message ListAllOrganizationsRequest {
   string state = 2;
   int32 page_size = 3 [(buf.validate.field) = {
     ignore: IGNORE_IF_ZERO_VALUE
-    int32: {gte: 1}
+    int32: {
+      gte: 1
+      lte: 5000
+    }
   }];
   int32 page_num = 4 [(buf.validate.field) = {
     ignore: IGNORE_IF_ZERO_VALUE
@@ -395,7 +401,10 @@ message ListAllInvoicesRequest {
   string org_id = 1;
   int32 page_size = 2 [(buf.validate.field) = {
     ignore: IGNORE_IF_ZERO_VALUE
-    int32: {gte: 1}
+    int32: {
+      gte: 1
+      lte: 5000
+    }
   }];
   int32 page_num = 3 [(buf.validate.field) = {
     ignore: IGNORE_IF_ZERO_VALUE
diff --git a/raystack/frontier/v1beta1/frontier.proto b/raystack/frontier/v1beta1/frontier.proto
index 36e248b6..14f1be9a 100644
--- a/raystack/frontier/v1beta1/frontier.proto
+++ b/raystack/frontier/v1beta1/frontier.proto
@@ -1078,7 +1078,10 @@ message UserRequestBody {
 message ListUsersRequest {
   int32 page_size = 1 [(buf.validate.field) = {
     ignore: IGNORE_IF_ZERO_VALUE
-    int32: {gte: 1}
+    int32: {
+      gte: 1
+      lte: 5000
+    }
   }];
   int32 page_num = 2 [(buf.validate.field) = {
     ignore: IGNORE_IF_ZERO_VALUE
@@ -1151,7 +1154,10 @@ message ListProjectsByCurrentUserRequest {
 
   int32 page_size = 5 [(buf.validate.field) = {
     ignore: IGNORE_IF_ZERO_VALUE
-    int32: {gte: 1}
+    int32: {
+      gte: 1
+      lte: 5000
+    }
   }];
   int32 page_num = 6 [(buf.validate.field) = {
     ignore: IGNORE_IF_ZERO_VALUE
@@ -1556,7 +1562,10 @@ message ListOrganizationsRequest {
   string state = 2;
   int32 page_size = 3 [(buf.validate.field) = {
     ignore: IGNORE_IF_ZERO_VALUE
-    int32: {gte: 1}
+    int32: {
+      gte: 1
+      lte: 5000
+    }
   }];
   int32 page_num = 4 [(buf.validate.field) = {
     ignore: IGNORE_IF_ZERO_VALUE
diff --git a/raystack/frontier/v1beta1/models.proto b/raystack/frontier/v1beta1/models.proto
index a0c185a1..f94addc3 100644
--- a/raystack/frontier/v1beta1/models.proto
+++ b/raystack/frontier/v1beta1/models.proto
@@ -871,7 +871,7 @@ message RQLRequest {
   repeated RQLFilter filters = 1;
   repeated string group_by = 2;
   uint32 offset = 3;
-  uint32 limit = 4;
+  uint32 limit = 4 [(buf.validate.field).uint32.lte = 5000];
   string search = 5;
   repeated RQLSort sort = 6;
 }