diff --git a/packages/api/src/data_source.ts b/packages/api/src/data_source.ts
index 1b24209bd..a8b67cfc7 100644
--- a/packages/api/src/data_source.ts
+++ b/packages/api/src/data_source.ts
@@ -16,4 +16,6 @@ export const appDataSource = new DataSource({
   subscribers: [__dirname + '/events/**/*{.js,.ts}'],
   namingStrategy: new SnakeNamingStrategy(),
   logger: new CustomTypeOrmLogger(['query', 'info']),
+  connectTimeoutMS: 40000, // 40 seconds
+  maxQueryExecutionTime: 10000, // 10 seconds
 })