diff --git a/roomserver/storage/shared/storage.go b/roomserver/storage/shared/storage.go
index f9e9e42f0..b1c5ef275 100644
--- a/roomserver/storage/shared/storage.go
+++ b/roomserver/storage/shared/storage.go
@@ -501,11 +501,15 @@ func (d *Database) events(
 		if !ok {
 			panic("should have position")
 		}
+		delete(positions, result.EventNID)
 		results[pos] = result
 		if result.Event != nil {
 			d.Cache.StoreRoomServerEvent(result.EventNID, result.Event)
 		}
 	}
+	if len(positions) > 0 {
+		panic("unsatisfied events")
+	}
 	if !redactionsArePermanent {
 		d.applyRedactions(results)
 	}