diff --git a/pkg/app_manager.go b/pkg/app_manager.go
index ad5ab66..01dda47 100644
--- a/pkg/app_manager.go
+++ b/pkg/app_manager.go
@@ -206,7 +206,7 @@ func (a *AppManager) ProcessSnapshot(block *types.Block) {
 		}
 	}
 
-	totalBlocksCount := a.StateManager.GetBlocksCountSinceLatest(a.Config.StoreBlocks - a.Config.FirstBlock + 1)
+	totalBlocksCount := a.StateManager.GetBlocksCountSinceLatest(a.Config.StoreBlocks - a.Config.FirstBlock - 1)
 	a.Logger.Info().
 		Int64("count", totalBlocksCount).
 		Int64("height", block.Height).
@@ -214,7 +214,7 @@ func (a *AppManager) ProcessSnapshot(block *types.Block) {
 
 	blocksCount := a.StateManager.GetBlocksCountSinceLatest(a.Config.BlocksWindow)
 
-	neededBlocks := utils.MinInt64(a.Config.BlocksWindow, a.StateManager.GetLastBlockHeight()-a.Config.FirstBlock+1)
+	neededBlocks := utils.MinInt64(a.Config.BlocksWindow, a.StateManager.GetLastBlockHeight()-a.Config.FirstBlock-1)
 	hasEnoughBlocks := blocksCount >= neededBlocks
 
 	if !hasEnoughBlocks {
@@ -405,10 +405,10 @@ func (a *AppManager) PopulateBlocks() {
 		return
 	}
 
-	missingBlocks := a.StateManager.GetMissingBlocksSinceLatest(a.Config.StoreBlocks - a.Config.FirstBlock + 1)
+	missingBlocks := a.StateManager.GetMissingBlocksSinceLatest(a.Config.StoreBlocks - a.Config.FirstBlock - 1)
 	if len(missingBlocks) == 0 {
 		a.Logger.Info().
-			Int64("count", a.Config.StoreBlocks-a.Config.FirstBlock+1).
+			Int64("count", a.Config.StoreBlocks-a.Config.FirstBlock-1).
 			Msg("Got enough blocks for populating")
 		a.IsPopulatingBlocks = false
 		return
@@ -417,11 +417,11 @@ func (a *AppManager) PopulateBlocks() {
 	blocksChunks := utils.SplitIntoChunks(missingBlocks, a.Config.Pagination.BlocksSearch)
 
 	for _, chunk := range blocksChunks {
-		count := a.StateManager.GetBlocksCountSinceLatest(a.Config.StoreBlocks - a.Config.FirstBlock + 1)
+		count := a.StateManager.GetBlocksCountSinceLatest(a.Config.StoreBlocks - a.Config.FirstBlock - 1)
 
 		a.Logger.Info().
 			Int64("count", count).
-			Int64("required", a.Config.StoreBlocks-a.Config.FirstBlock+1).
+			Int64("required", a.Config.StoreBlocks-a.Config.FirstBlock-1).
 			Int("needed_blocks", len(chunk)).
 			Ints64("blocks", chunk).
 			Msg("Fetching more blocks...")
diff --git a/pkg/state/manager.go b/pkg/state/manager.go
index d288728..3c023f1 100644
--- a/pkg/state/manager.go
+++ b/pkg/state/manager.go
@@ -140,7 +140,7 @@ func (m *Manager) GetSnapshot() (snapshotPkg.Snapshot, error) {
 	validators := m.state.GetValidators()
 	entries := make(types.Entries, len(validators))
 
-	neededBlocks := utils.MinInt64(m.config.BlocksWindow, m.GetLastBlockHeight()-m.config.FirstBlock)
+	neededBlocks := utils.MinInt64(m.config.BlocksWindow, m.GetLastBlockHeight()-m.config.FirstBlock-1)
 
 	for _, validator := range validators {
 		// Taking the active status from the last block, as there might be a case
@@ -238,7 +238,7 @@ func (m *Manager) GetBlockTime() time.Duration {
 }
 
 func (m *Manager) GetValidatorMissedBlocks(validator *types.Validator) (types.SignatureInto, error) {
-	blocksToCheck := utils.MinInt64(m.config.BlocksWindow, m.GetLastBlockHeight()-m.config.FirstBlock)
+	blocksToCheck := utils.MinInt64(m.config.BlocksWindow, m.GetLastBlockHeight()-m.config.FirstBlock-1)
 	return m.state.GetValidatorMissedBlocks(validator, blocksToCheck)
 }