diff --git a/cmd/state/stateless/check_change_sets.go b/cmd/state/stateless/check_change_sets.go
index d0c58e61e..43c4bef51 100644
--- a/cmd/state/stateless/check_change_sets.go
+++ b/cmd/state/stateless/check_change_sets.go
@@ -95,11 +95,11 @@ func CheckChangeSets(genesis *core.Genesis, blockNum uint64, chaindata string, h
 			if err := rawdb.WriteReceipts(batch, block.NumberU64(), receipts); err != nil {
 				return err
 			}
-		}
-		if batch.BatchSize() >= batch.IdealBatchSize() {
-			log.Info("Committing receipts", "up to block", block.NumberU64(), "batch size", common.StorageSize(batch.BatchSize()))
-			if err := batch.CommitAndBegin(context.Background()); err != nil {
-				return err
+			if batch.BatchSize() >= batch.IdealBatchSize() {
+				log.Info("Committing receipts", "up to block", block.NumberU64(), "batch size", common.StorageSize(batch.BatchSize()))
+				if err := batch.CommitAndBegin(context.Background()); err != nil {
+					return err
+				}
 			}
 		}