diff --git a/gateway/src/main.ts b/gateway/src/main.ts
index 187b1547..c801da3f 100644
--- a/gateway/src/main.ts
+++ b/gateway/src/main.ts
@@ -86,7 +86,7 @@ function loadConfig() {
       'http://localhost:5173',
       'http://localhost:8080',
     ],
-    databaseUrl: configData.database?.url || process.env.DATABASE_URL || 'postgresql://localhost/dexorder',
+    databaseUrl: configData.database?.url || secretsData.database?.url || process.env.DATABASE_URL || 'postgresql://localhost/dexorder',
 
     // Authentication configuration
     authSecret: secretsData.auth?.secret || process.env.AUTH_SECRET || 'change-me-in-production',