diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/state_block_table.go b/src/github.com/matrix-org/dendrite/roomserver/storage/state_block_table.go
index 2febfe434..14fed0f56 100644
--- a/src/github.com/matrix-org/dendrite/roomserver/storage/state_block_table.go
+++ b/src/github.com/matrix-org/dendrite/roomserver/storage/state_block_table.go
@@ -198,8 +198,7 @@ func (s *stateBlockStatements) bulkSelectFilteredStateBlockEntries(
 			if current.StateEntries != nil {
 				results = append(results, current)
 			}
-			current.StateBlockNID = types.StateBlockNID(stateBlockNID)
-			current.StateEntries = nil
+			current = types.StateEntryList{StateBlockNID: types.StateBlockNID(stateBlockNID)}
 		}
 		current.StateEntries = append(current.StateEntries, entry)
 	}