diff --git a/apps/backend/src/main.ts b/apps/backend/src/main.ts
index 703a064243..3c19b457d7 100644
--- a/apps/backend/src/main.ts
+++ b/apps/backend/src/main.ts
@@ -48,7 +48,11 @@ async function start() {
     },
   });
 
-  await startMcp(app);
+  try {
+    await startMcp(app);
+  } catch (e) {
+    Logger.error('Failed to initialize Mastra MCP server:', e);
+  }
 
   app.useGlobalPipes(
     new ValidationPipe({
diff --git a/libraries/nestjs-libraries/src/chat/mastra.store.ts b/libraries/nestjs-libraries/src/chat/mastra.store.ts
index 4dc00896d3..8fdc5560ce 100644
--- a/libraries/nestjs-libraries/src/chat/mastra.store.ts
+++ b/libraries/nestjs-libraries/src/chat/mastra.store.ts
@@ -2,5 +2,5 @@ import { PostgresStore } from '@mastra/pg';
 
 export const pStore = new PostgresStore({
   id: 'postiz-store',
-  connectionString: process.env.DATABASE_URL!,
+  connectionString: process.env.DATABASE_DIRECT_URL || process.env.DATABASE_URL!,
 });