diff --git a/backend/windmill-worker/src/bigquery_executor.rs b/backend/windmill-worker/src/bigquery_executor.rs
index 8e3ac7f68c..2eef2be433 100644
--- a/backend/windmill-worker/src/bigquery_executor.rs
+++ b/backend/windmill-worker/src/bigquery_executor.rs
@@ -130,7 +130,7 @@ pub async fn do_bigquery(
     }
 
     let timeout_ms = i32::try_from(
-        resolve_job_timeout(&db, &job.workspace_id, job.id, None)
+        resolve_job_timeout(&db, &job.workspace_id, job.id, job.timeout)
             .await
             .0
             .as_millis(),
diff --git a/backend/windmill-worker/src/pg_executor.rs b/backend/windmill-worker/src/pg_executor.rs
index aed4e0b74b..5801330b3b 100644
--- a/backend/windmill-worker/src/pg_executor.rs
+++ b/backend/windmill-worker/src/pg_executor.rs
@@ -222,12 +222,13 @@ pub async fn do_postgresql(
     );
 
     let timeout_ms = u64::try_from(
-        resolve_job_timeout(&db, &job.workspace_id, job.id, None)
+        resolve_job_timeout(&db, &job.workspace_id, job.id, job.timeout)
             .await
             .0
             .as_millis(),
     )
     .unwrap_or(200000);
+    tracing::info!("Query timeout: {}ms", timeout_ms);
     let result = tokio::select! {
         biased;
         result = tokio::time::timeout(std::time::Duration::from_millis(timeout_ms), result_f) => result