diff --git a/pkg/github/issues.go b/pkg/github/issues.go
index 53ce61bf..e27215ce 100644
--- a/pkg/github/issues.go
+++ b/pkg/github/issues.go
@@ -164,9 +164,12 @@ func searchIssues(client *github.Client, t translations.TranslationHelperFunc) (
 			),
 			mcp.WithNumber("per_page",
 				mcp.Description("Results per page (max 100)"),
+				mcp.Min(1),
+				mcp.Max(100),
 			),
 			mcp.WithNumber("page",
 				mcp.Description("Page number"),
+				mcp.Min(1),
 			),
 		),
 		func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
diff --git a/pkg/github/search.go b/pkg/github/search.go
index fc81432d..e02c3d0c 100644
--- a/pkg/github/search.go
+++ b/pkg/github/search.go
@@ -88,9 +88,12 @@ func searchCode(client *github.Client, t translations.TranslationHelperFunc) (to
 			),
 			mcp.WithNumber("per_page",
 				mcp.Description("Results per page (max 100)"),
+				mcp.Min(1),
+				mcp.Max(100),
 			),
 			mcp.WithNumber("page",
 				mcp.Description("Page number"),
+				mcp.Min(1),
 			),
 		),
 		func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
@@ -165,9 +168,12 @@ func searchUsers(client *github.Client, t translations.TranslationHelperFunc) (t
 			),
 			mcp.WithNumber("per_page",
 				mcp.Description("Results per page (max 100)"),
+				mcp.Min(1),
+				mcp.Max(100),
 			),
 			mcp.WithNumber("page",
 				mcp.Description("Page number"),
+				mcp.Min(1),
 			),
 		),
 		func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {