diff --git a/surfsense_web/app/db/index.ts b/surfsense_web/app/db/index.ts
index 277848bb5..db86725e1 100644
--- a/surfsense_web/app/db/index.ts
+++ b/surfsense_web/app/db/index.ts
@@ -2,5 +2,12 @@ import { drizzle } from "drizzle-orm/postgres-js";
 import postgres from "postgres";
 import * as schema from "./schema";
 
-const client = postgres(process.env.DATABASE_URL!);
+// Configure postgres client for Vercel serverless environment
+const client = postgres(process.env.DATABASE_URL!, {
+	max: 1, // Limit connections for serverless (Vercel)
+	idle_timeout: 20, // Close idle connections after 20 seconds
+	max_lifetime: 60 * 30, // Close connections after 30 minutes
+	connect_timeout: 10, // Connection timeout in seconds
+});
+
 export const db = drizzle({ client, schema });