diff --git a/mcp/src/serverInfo.ts b/mcp/src/serverInfo.ts
index ceadea8..99a05f3 100644
--- a/mcp/src/serverInfo.ts
+++ b/mcp/src/serverInfo.ts
@@ -7,7 +7,13 @@ export const serverInfo = {
   version: '1.0.1',
 } as const;
 
-const pgPool = new Pool();
+const pgPool = new Pool({
+  connectionTimeoutMillis: 5000,
+  query_timeout: 30000,
+  idleTimeoutMillis: 30000,
+  keepAlive: true,
+  keepAliveInitialDelayMillis: 10000,
+});
 const openAIClient = new OpenAI();
 
 export const context: ServerContext = { openAIClient, pgPool };