diff --git a/federationapi/storage/postgres/relay_servers_table.go b/federationapi/storage/postgres/relay_servers_table.go
index 93cceeadb..600443615 100644
--- a/federationapi/storage/postgres/relay_servers_table.go
+++ b/federationapi/storage/postgres/relay_servers_table.go
@@ -66,19 +66,12 @@ func NewPostgresRelayServersTable(db *sql.DB) (s *relayServersStatements, err er
 		return
 	}
 
-	if s.insertRelayServersStmt, err = db.Prepare(insertRelayServersSQL); err != nil {
-		return
-	}
-	if s.selectRelayServersStmt, err = db.Prepare(selectRelayServersSQL); err != nil {
-		return
-	}
-	if s.deleteRelayServersStmt, err = db.Prepare(deleteRelayServersSQL); err != nil {
-		return
-	}
-	if s.deleteAllRelayServersStmt, err = db.Prepare(deleteAllRelayServersSQL); err != nil {
-		return
-	}
-	return
+	return s, sqlutil.StatementList{
+		{&s.insertRelayServersStmt, insertRelayServersSQL},
+		{&s.selectRelayServersStmt, selectRelayServersSQL},
+		{&s.deleteRelayServersStmt, deleteRelayServersSQL},
+		{&s.deleteAllRelayServersStmt, deleteAllRelayServersSQL},
+	}.Prepare(db)
 }
 
 func (s *relayServersStatements) InsertRelayServers(
diff --git a/federationapi/storage/sqlite3/relay_servers_table.go b/federationapi/storage/sqlite3/relay_servers_table.go
index e32f0a2ac..6d85c84d5 100644
--- a/federationapi/storage/sqlite3/relay_servers_table.go
+++ b/federationapi/storage/sqlite3/relay_servers_table.go
@@ -66,19 +66,12 @@ func NewSQLiteRelayServersTable(db *sql.DB) (s *relayServersStatements, err erro
 		return
 	}
 
-	if s.insertRelayServersStmt, err = db.Prepare(insertRelayServersSQL); err != nil {
-		return
-	}
-	if s.selectRelayServersStmt, err = db.Prepare(selectRelayServersSQL); err != nil {
-		return
-	}
-	if s.deleteRelayServersStmt, err = db.Prepare(deleteRelayServersSQL); err != nil {
-		return
-	}
-	if s.deleteAllRelayServersStmt, err = db.Prepare(deleteAllRelayServersSQL); err != nil {
-		return
-	}
-	return
+	return s, sqlutil.StatementList{
+		{&s.insertRelayServersStmt, insertRelayServersSQL},
+		{&s.selectRelayServersStmt, selectRelayServersSQL},
+		{&s.deleteRelayServersStmt, deleteRelayServersSQL},
+		{&s.deleteAllRelayServersStmt, deleteAllRelayServersSQL},
+	}.Prepare(db)
 }
 
 func (s *relayServersStatements) InsertRelayServers(