diff --git a/roomserver/storage/sqlite3/invite_table.go b/roomserver/storage/sqlite3/invite_table.go
index 4ca8cb2b1..5a0f0bf79 100644
--- a/roomserver/storage/sqlite3/invite_table.go
+++ b/roomserver/storage/sqlite3/invite_table.go
@@ -84,7 +84,7 @@ func (s *inviteStatements) insertInviteEvent(
 	inviteEventJSON []byte,
 ) (bool, error) {
 	stmt := common.TxStmt(txn, s.insertInviteEventStmt)
-	defer stmt.Close()
+	defer stmt.Close() // nolint: errcheck
 	result, err := stmt.ExecContext(
 		ctx, inviteEventID, roomNID, targetUserNID, senderUserNID, inviteEventJSON,
 	)
diff --git a/roomserver/storage/sqlite3/list.go b/roomserver/storage/sqlite3/list.go
index f9874e838..4fe4e334b 100644
--- a/roomserver/storage/sqlite3/list.go
+++ b/roomserver/storage/sqlite3/list.go
@@ -16,7 +16,3 @@ func sqliteIn(a pq.Int64Array) string {
 	}
 	return strings.Join(b, ",")
 }
-
-func sqliteInStr(a pq.StringArray) string {
-	return "\"" + strings.Join(a, "\",\"") + "\""
-}
diff --git a/roomserver/storage/sqlite3/state_block_table.go b/roomserver/storage/sqlite3/state_block_table.go
index 41a8bcff3..ac593546a 100644
--- a/roomserver/storage/sqlite3/state_block_table.go
+++ b/roomserver/storage/sqlite3/state_block_table.go
@@ -181,7 +181,7 @@ func (s *stateBlockStatements) bulkSelectStateBlockEntries(
 }
 
 func (s *stateBlockStatements) bulkSelectFilteredStateBlockEntries(
-	ctx context.Context, txn *sql.Tx,
+	ctx context.Context, txn *sql.Tx, // nolint: unparam
 	stateBlockNIDs []types.StateBlockNID,
 	stateKeyTuples []types.StateKeyTuple,
 ) ([]types.StateEntryList, error) {
@@ -259,14 +259,6 @@ func (s *stateBlockStatements) bulkSelectFilteredStateBlockEntries(
 	return results, nil
 }
 
-func stateBlockNIDsAsArray(stateBlockNIDs []types.StateBlockNID) pq.Int64Array {
-	nids := make([]int64, len(stateBlockNIDs))
-	for i := range stateBlockNIDs {
-		nids[i] = int64(stateBlockNIDs[i])
-	}
-	return pq.Int64Array(nids)
-}
-
 type stateKeyTupleSorter []types.StateKeyTuple
 
 func (s stateKeyTupleSorter) Len() int           { return len(s) }
diff --git a/roomserver/storage/sqlite3/state_snapshot_table.go b/roomserver/storage/sqlite3/state_snapshot_table.go
index 795d6b388..df97aa419 100644
--- a/roomserver/storage/sqlite3/state_snapshot_table.go
+++ b/roomserver/storage/sqlite3/state_snapshot_table.go
@@ -48,7 +48,6 @@ const bulkSelectStateBlockNIDsSQL = "" +
 type stateSnapshotStatements struct {
 	db                           *sql.DB
 	insertStateStmt              *sql.Stmt
-	insertStateResultStmt        *sql.Stmt
 	bulkSelectStateBlockNIDsStmt *sql.Stmt
 }
 
diff --git a/roomserver/storage/sqlite3/storage.go b/roomserver/storage/sqlite3/storage.go
index 9caac07ca..16cbf7835 100644
--- a/roomserver/storage/sqlite3/storage.go
+++ b/roomserver/storage/sqlite3/storage.go
@@ -401,7 +401,10 @@ func (d *Database) GetLatestEventsForUpdate(
 	// 'database is locked' errors caused by multiple write txns (one being the long-lived txn created here)
 	// so for now let's not use a long-lived txn at all, and just commit it here and set the txn to nil so
 	// we fail fast if someone tries to use the underlying txn object.
-	txn.Commit()
+	err = txn.Commit()
+	if err != nil {
+		return nil, err
+	}
 	return &roomRecentEventsUpdater{
 		transaction{ctx, nil}, d, roomNID, stateAndRefs, lastEventIDSent, currentStateSnapshotNID,
 	}, nil