From b99f594a93dda7645fabda4b81498ea4ad40bc97 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Tue, 2 Nov 2021 16:47:39 +0000
Subject: [PATCH] Fix #2028 (#2036)

---
 roomserver/storage/shared/storage.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/roomserver/storage/shared/storage.go b/roomserver/storage/shared/storage.go
index b4fc15f1d..3685332fd 100644
--- a/roomserver/storage/shared/storage.go
+++ b/roomserver/storage/shared/storage.go
@@ -165,14 +165,21 @@ func (d *Database) AddState(
 		if berr != nil {
 			return 0, fmt.Errorf("d.StateBlockTable.BulkSelectStateBlockEntries: %w", berr)
 		}
+		var found bool
 		for i := len(state) - 1; i >= 0; i-- {
+			found = false
 			for _, events := range blocks {
 				for _, event := range events {
 					if state[i].EventNID == event {
-						state = append(state[:i], state[i+1:]...)
+						found = true
+						break
 					}
 				}
 			}
+			if found {
+				state = append(state[:i], state[i+1:]...)
+				i--
+			}
 		}
 	}
 	err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {