diff --git a/packages/server/src/DataSource.ts b/packages/server/src/DataSource.ts
index f6e43ba7293..3d4d2acef64 100644
--- a/packages/server/src/DataSource.ts
+++ b/packages/server/src/DataSource.ts
@@ -70,13 +70,16 @@ export const init = async (): Promise<void> => {
                 username: process.env.DATABASE_USER,
                 password: process.env.DATABASE_PASSWORD,
                 database: process.env.DATABASE_NAME,
+                schema: process.env.DATABASE_SCHEMA || 'public',
                 ssl: getDatabaseSSLFromEnv(),
                 synchronize: false,
                 migrationsRun: false,
                 entities: Object.values(entities),
                 migrations: postgresMigrations,
                 extra: {
-                    idleTimeoutMillis: 120000
+                    idleTimeoutMillis: 120000,
+                    // Ensure search_path includes extensions schema for UUID functions
+                    searchPath: process.env.DATABASE_SCHEMA ? `${process.env.DATABASE_SCHEMA}, public, extensions` : 'public, extensions'
                 },
                 logging: ['error', 'warn', 'info', 'log'],
                 logger: 'advanced-console',