diff --git a/eventstore/boltdb/replace.go b/eventstore/boltdb/replace.go
index 6ec05e7..122c993 100644
--- a/eventstore/boltdb/replace.go
+++ b/eventstore/boltdb/replace.go
@@ -18,11 +18,10 @@ func (b *BoltBackend) ReplaceEvent(evt nostr.Event) error {
 		}
 
 		// now we fetch the past events, whatever they are, delete them and then save the new
-		var yield_ func(nostr.Event) bool
+		var err error
 		var results iter.Seq[nostr.Event] = func(yield func(nostr.Event) bool) {
-			yield_ = yield
+			err = b.query(txn, filter, 10 /* in theory limit could be just 1 and this should work */, yield)
 		}
-		err := b.query(txn, filter, 10 /* in theory limit could be just 1 and this should work */, yield_)
 		if err != nil {
 			return fmt.Errorf("failed to query past events with %s: %w", filter, err)
 		}
diff --git a/eventstore/lmdb/replace.go b/eventstore/lmdb/replace.go
index be8422d..3d73cea 100644
--- a/eventstore/lmdb/replace.go
+++ b/eventstore/lmdb/replace.go
@@ -18,11 +18,10 @@ func (b *LMDBBackend) ReplaceEvent(evt nostr.Event) error {
 		}
 
 		// now we fetch the past events, whatever they are, delete them and then save the new
-		var yield_ func(nostr.Event) bool
+		var err error
 		var results iter.Seq[nostr.Event] = func(yield func(nostr.Event) bool) {
-			yield_ = yield
+			err = b.query(txn, filter, 10 /* in theory limit could be just 1 and this should work */, yield)
 		}
-		err := b.query(txn, filter, 10 /* in theory limit could be just 1 and this should work */, yield_)
 		if err != nil {
 			return fmt.Errorf("failed to query past events with %s: %w", filter, err)
 		}
diff --git a/eventstore/mmm/replace.go b/eventstore/mmm/replace.go
index 8fc78a4..01169a2 100644
--- a/eventstore/mmm/replace.go
+++ b/eventstore/mmm/replace.go
@@ -28,11 +28,10 @@ func (il *IndexingLayer) ReplaceEvent(evt nostr.Event) error {
 
 		return il.lmdbEnv.Update(func(iltxn *lmdb.Txn) error {
 			// now we fetch the past events, whatever they are, delete them and then save the new
-			var yield_ func(nostr.Event) bool
+			var err error
 			var results iter.Seq[nostr.Event] = func(yield func(nostr.Event) bool) {
-				yield_ = yield
+				err = il.query(iltxn, filter, 10 /* in theory limit could be just 1 and this should work */, yield)
 			}
-			err := il.query(iltxn, filter, 10 /* in theory limit could be just 1 and this should work */, yield_)
 			if err != nil {
 				return fmt.Errorf("failed to query past events with %s: %w", filter, err)
 			}