diff --git a/rpc/src/rpc.rs b/rpc/src/rpc.rs
index 6813624c04ce6f..d368703ef1bf94 100644
--- a/rpc/src/rpc.rs
+++ b/rpc/src/rpc.rs
@@ -589,15 +589,15 @@ impl JsonRpcRequestProcessor {
 
         let bank = self.get_bank_with_config(slot_context)?;
 
-        let mut reward_map: HashMap<String, (Reward, Slot)> = {
-            let first_confirmed_block_in_epoch = *self
-                .get_blocks_with_limit(first_slot_in_epoch, 1, config.commitment)
-                .await?
-                .first()
-                .ok_or(RpcCustomError::BlockNotAvailable {
-                    slot: first_slot_in_epoch,
-                })?;
+        let first_confirmed_block_in_epoch = *self
+            .get_blocks_with_limit(first_slot_in_epoch, 1, config.commitment)
+            .await?
+            .first()
+            .ok_or(RpcCustomError::BlockNotAvailable {
+                slot: first_slot_in_epoch,
+            })?;
 
+        let mut reward_map: HashMap<String, (Reward, Slot)> = {
             let addresses: Vec<String> =
                 addresses.iter().map(|pubkey| pubkey.to_string()).collect();
 
@@ -643,8 +643,8 @@ impl JsonRpcRequestProcessor {
 
             let block_list = self
                 .get_blocks_with_limit(
-                    first_slot_in_epoch,
-                    partition_data.num_partitions + 1,
+                    first_confirmed_block_in_epoch + 1,
+                    partition_data.num_partitions,
                     config.commitment,
                 )
                 .await?;