diff --git a/docs/spec/rpc/swagger.yaml b/docs/spec/rpc/swagger.yaml
index d498ec508..c445d5a66 100644
--- a/docs/spec/rpc/swagger.yaml
+++ b/docs/spec/rpc/swagger.yaml
@@ -541,7 +541,7 @@ paths:
           description: "Number of entries per page (max: 100)"
           required: false
           x-example: 30
-          default: 0
+          default: 30
       tags:
         - Info
       description: |
diff --git a/lite/client/provider.go b/lite/client/provider.go
index 475763d6c..2bcb8f731 100644
--- a/lite/client/provider.go
+++ b/lite/client/provider.go
@@ -106,7 +106,7 @@ func (p *provider) getValidatorSet(chainID string, height int64) (valset *types.
 		err = fmt.Errorf("expected height >= 1, got height %v", height)
 		return
 	}
-	res, err := p.client.Validators(&height, 0, 0) // page & perPage are hard coded to 0 to get the entire validator set in one request
+	res, err := p.client.Validators(&height, 0, 0)
 	if err != nil {
 		// TODO pass through other types of errors.
 		return nil, lerr.ErrUnknownValidators(chainID, height)
diff --git a/rpc/core/consensus.go b/rpc/core/consensus.go
index 219c3f1e9..698a94b50 100644
--- a/rpc/core/consensus.go
+++ b/rpc/core/consensus.go
@@ -55,7 +55,7 @@ import (
 // |-----------+--------+---------+----------+------------------------------------------------|
 // | height    | int64  | 0       | false    | Height (0 means latest)                        |
 // | page      | int    | 0       | false    | Page number (1-based)                          |
-// | per_page  | int    | 0       | false    | Number of entries per page (max: 100)          |
+// | per_page  | int    | 30      | false    | Number of entries per page (max: 100)          |
 
 func Validators(ctx *rpctypes.Context, heightPtr *int64, page, perPage int) (*ctypes.ResultValidators, error) {
 	// The latest validator that we know is the