diff --git a/ethdb/pebble/pebble.go b/ethdb/pebble/pebble.go
index 568b2e745c..939a39ccbf 100644
--- a/ethdb/pebble/pebble.go
+++ b/ethdb/pebble/pebble.go
@@ -557,7 +557,7 @@ func (b *batch) Reset() {
 // Replay replays the batch contents.
 func (b *batch) Replay(w ethdb.KeyValueWriter) (bErr error) {
 	reader := b.b.Reader()
-	for {
+	for bErr == nil {
 		kind, k, v, ok, err := reader.Next()
 		if !ok || err != nil {
 			break