diff --git a/common/partition_offset_table.go b/common/partition_offset_table.go
index bb23755c7..bf37e2ed5 100644
--- a/common/partition_offset_table.go
+++ b/common/partition_offset_table.go
@@ -50,7 +50,6 @@ type PartitionOffsetStatements struct {
 // Prepare converts the raw SQL statements into prepared statements.
 // Takes a prefix to prepend to the table name used to store the partition offsets.
 // This allows multiple components to share the same database schema.
-// nolint: safesql
 func (s *PartitionOffsetStatements) Prepare(db *sql.DB, prefix string) (err error) {
 	_, err = db.Exec(strings.Replace(partitionOffsetsSchema, "${prefix}", prefix, -1))
 	if err != nil {
diff --git a/publicroomsapi/storage/public_rooms_table.go b/publicroomsapi/storage/public_rooms_table.go
index 85d65c2cc..5e1eb3e12 100644
--- a/publicroomsapi/storage/public_rooms_table.go
+++ b/publicroomsapi/storage/public_rooms_table.go
@@ -134,7 +134,6 @@ type publicRoomsStatements struct {
 	updateRoomAttributeStmts                map[string]*sql.Stmt
 }
 
-// nolint: safesql
 func (s *publicRoomsStatements) prepare(db *sql.DB) (err error) {
 	_, err = db.Exec(publicRoomsSchema)
 	if err != nil {
diff --git a/roomserver/storage/prepare.go b/roomserver/storage/prepare.go
index 61c49a3c1..b19765992 100644
--- a/roomserver/storage/prepare.go
+++ b/roomserver/storage/prepare.go
@@ -25,7 +25,6 @@ type statementList []struct {
 }
 
 // prepare the SQL for each statement in the list and assign the result to the prepared statement.
-// nolint: safesql
 func (s statementList) prepare(db *sql.DB) (err error) {
 	for _, statement := range s {
 		if *statement.statement, err = db.Prepare(statement.sql); err != nil {