diff --git a/backend/apps/db/db.py b/backend/apps/db/db.py
index ede3d277..607d7cb0 100644
--- a/backend/apps/db/db.py
+++ b/backend/apps/db/db.py
@@ -52,10 +52,12 @@ def get_uri_from_config(type: str, conf: DatasourceConf) -> str:
     return db_url
 
 
-def get_engine(ds: CoreDatasource, timeout: int = 30) -> Engine:
+def get_engine(ds: CoreDatasource, timeout: int = 0) -> Engine:
     conf = DatasourceConf(**json.loads(aes_decrypt(ds.configuration))) if ds.type != "excel" else get_engine_config()
     if conf.timeout is None:
         conf.timeout = timeout
+    if timeout > 0:
+        conf.timeout = timeout
     if ds.type == "pg" and (conf.dbSchema is not None and conf.dbSchema != ""):
         engine = create_engine(get_uri(ds),
                                connect_args={"options": f"-c search_path={urllib.parse.quote(conf.dbSchema)}",