diff --git a/roomserver/storage/sqlite3/storage.go b/roomserver/storage/sqlite3/storage.go
index a033e46e0..f3fe4309f 100644
--- a/roomserver/storage/sqlite3/storage.go
+++ b/roomserver/storage/sqlite3/storage.go
@@ -285,7 +285,8 @@ func (d *Database) AddState(
 ) (stateNID types.StateSnapshotNID, err error) {
 	err = common.WithTransaction(d.db, func(txn *sql.Tx) error {
 		if len(state) > 0 {
-			stateBlockNID, err := d.statements.bulkInsertStateData(ctx, txn, state)
+			var stateBlockNID types.StateBlockNID
+			stateBlockNID, err = d.statements.bulkInsertStateData(ctx, txn, state)
 			if err != nil {
 				return err
 			}