diff --git a/roomserver/storage/sqlite3/storage.go b/roomserver/storage/sqlite3/storage.go
index 18f009dd5..9caac07ca 100644
--- a/roomserver/storage/sqlite3/storage.go
+++ b/roomserver/storage/sqlite3/storage.go
@@ -285,6 +285,7 @@ func (d *Database) AddState(
 ) (stateNID types.StateSnapshotNID, err error) {
 	err = common.WithTransaction(d.db, func(txn *sql.Tx) error {
 		if len(state) > 0 {
+			var stateBlockNID types.StateBlockNID
 			stateBlockNID, err = d.statements.selectNextStateBlockNID(ctx, txn)
 			if err != nil {
 				return err
diff --git a/syncapi/storage/sqlite3/syncserver.go b/syncapi/storage/sqlite3/syncserver.go
index dee2a4235..0a5a4c220 100644
--- a/syncapi/storage/sqlite3/syncserver.go
+++ b/syncapi/storage/sqlite3/syncserver.go
@@ -89,7 +89,7 @@ func NewSyncServerDatasource(dataSourceName string) (*SyncServerDatasource, erro
 	return &d, nil
 }
 
-func (d *SyncServerDataSource) prepare() error {
+func (d *SyncServerDatasource) prepare() (err error) {
 	if err = d.PartitionOffsetStatements.Prepare(d.db, "syncapi"); err != nil {
 		return err
 	}