diff --git a/beacon-light-client/plonky2/get_balances_input/get_balances_input.ts b/beacon-light-client/plonky2/get_balances_input/get_balances_input.ts
index 92960857f..02f237da3 100644
--- a/beacon-light-client/plonky2/get_balances_input/get_balances_input.ts
+++ b/beacon-light-client/plonky2/get_balances_input/get_balances_input.ts
@@ -49,7 +49,7 @@ let TAKE;
       alias: 'take',
       describe: 'The number of validators to take',
       type: 'number',
-      default: 1024,
+      default: Infinity,
       description: 'Sets the number of validators to take',
     }).argv;
 
@@ -86,6 +86,7 @@ let TAKE;
   const { beaconState } = await beaconApi.getBeaconState(6953401);
 
   const validators = beaconState.validators.slice(0, TAKE);
+  TAKE = validators.length;
 
   beaconState.validators = validators;
   beaconState.balances = beaconState.balances.slice(0, TAKE);
diff --git a/beacon-light-client/plonky2/validators_commitment_mapper_tree/get_changed_validators.ts b/beacon-light-client/plonky2/validators_commitment_mapper_tree/get_changed_validators.ts
index fd70dca77..ff5b595ab 100644
--- a/beacon-light-client/plonky2/validators_commitment_mapper_tree/get_changed_validators.ts
+++ b/beacon-light-client/plonky2/validators_commitment_mapper_tree/get_changed_validators.ts
@@ -51,7 +51,7 @@ let TAKE: number | undefined;
       alias: 'take',
       describe: 'The number of validators to take',
       type: 'number',
-      default: undefined,
+      default: Infinity,
       description: 'Sets the number of validators to take',
     }).argv;