diff --git a/service/pkg/db/db.go b/service/pkg/db/db.go
index 75c8704f15..ce78b554f0 100644
--- a/service/pkg/db/db.go
+++ b/service/pkg/db/db.go
@@ -252,7 +252,7 @@ func (c Config) buildConfig() (*pgxpool.Config, error) {
 
 	// Configure the search_path schema immediately on connection opening
 	parsed.AfterConnect = func(ctx context.Context, conn *pgx.Conn) error {
-		_, err := conn.Exec(ctx, "SET search_path TO "+c.Schema)
+		_, err := conn.Exec(ctx, "SET search_path TO "+pgx.Identifier{c.Schema}.Sanitize())
 		if err != nil {
 			slog.Error("failed to set database client search_path",
 				slog.String("schema", c.Schema),
diff --git a/service/pkg/db/db_migration.go b/service/pkg/db/db_migration.go
index 8cbf05f51c..895d24d0b9 100644
--- a/service/pkg/db/db_migration.go
+++ b/service/pkg/db/db_migration.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"log/slog"
 
+	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/jackc/pgx/v5/stdlib"
 	"github.com/pressly/goose/v3"
@@ -57,7 +58,7 @@ func (c *Client) RunMigrations(ctx context.Context, migrations *embed.FS) (int,
 	)
 
 	// Create schema if it doesn't exist
-	q := "CREATE SCHEMA IF NOT EXISTS " + c.config.Schema
+	q := "CREATE SCHEMA IF NOT EXISTS " + pgx.Identifier{c.config.Schema}.Sanitize()
 	tag, err := c.Pgx.Exec(ctx, q)
 	if err != nil {
 		slog.ErrorContext(ctx,