diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index fed66058fd..4cab2903fb 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-f860277e8a5719c59d8961856fd84e3be5c3a83b
\ No newline at end of file
+8d3c5d3bdf03b43d6f4b4ede30ab276354874724
\ No newline at end of file
diff --git a/backend/windmill-api/src/triggers/http/handler.rs b/backend/windmill-api/src/triggers/http/handler.rs
index e2e5546e09..890f44531f 100644
--- a/backend/windmill-api/src/triggers/http/handler.rs
+++ b/backend/windmill-api/src/triggers/http/handler.rs
@@ -989,6 +989,7 @@ async fn route_job(
             trigger.error_handler_path.as_deref(),
             trigger.error_handler_args.as_ref(),
             format!("http_trigger/{}", trigger.path),
+            None,
         )
         .await
         .map_err(|e| e.into_response())
@@ -1005,6 +1006,7 @@ async fn route_job(
             trigger.error_handler_path.as_deref(),
             trigger.error_handler_args.as_ref(),
             format!("http_trigger/{}", trigger.path),
+            None,
         )
         .await
         .map_err(|e| e.into_response())
diff --git a/backend/windmill-api/src/triggers/listener.rs b/backend/windmill-api/src/triggers/listener.rs
index e6a0110b2a..d0ca14e9eb 100644
--- a/backend/windmill-api/src/triggers/listener.rs
+++ b/backend/windmill-api/src/triggers/listener.rs
@@ -500,6 +500,7 @@ pub trait Listener: TriggerCrud + TriggerJobArgs {
             error_handler_path.as_deref(),
             error_handler_args,
             format!("{}_trigger/{}", Self::TRIGGER_KIND, listening_trigger.path),
+            None,
         )
         .await?;
 
diff --git a/backend/windmill-api/src/triggers/trigger_helpers.rs b/backend/windmill-api/src/triggers/trigger_helpers.rs
index 8901c24fcc..15f9deb987 100644
--- a/backend/windmill-api/src/triggers/trigger_helpers.rs
+++ b/backend/windmill-api/src/triggers/trigger_helpers.rs
@@ -487,6 +487,7 @@ async fn trigger_runnable_inner(
     error_handler_path: Option<&str>,
     error_handler_args: Option<&sqlx::types::Json<HashMap<String, serde_json::Value>>>,
     trigger_path: String,
+    job_id: Option<Uuid>,
 ) -> Result<(Uuid, Option<bool>, Option<String>)> {
     let error_handler_args = error_handler_args.map(|args| {
         let args = args
@@ -499,7 +500,7 @@ async fn trigger_runnable_inner(
 
     let user_db = user_db.unwrap_or_else(|| UserDB::new(db.clone()));
     let (uuid, delete_after_use, early_return) = if is_flow {
-        let run_query = RunJobQuery::default();
+        let run_query = RunJobQuery { job_id, ..Default::default() };
         let path = StripPath(runnable_path.to_string());
         let (uuid, early_return) = run_flow_by_path_inner(
             authed,
@@ -524,6 +525,7 @@ async fn trigger_runnable_inner(
             error_handler_path,
             error_handler_args.as_ref(),
             trigger_path,
+            job_id,
         )
         .await?;
         (uuid, delete_after_use, None)
@@ -545,6 +547,7 @@ pub async fn trigger_runnable(
     error_handler_path: Option<&str>,
     error_handler_args: Option<&sqlx::types::Json<HashMap<String, serde_json::Value>>>,
     trigger_path: String,
+    job_id: Option<Uuid>,
 ) -> Result<axum::response::Response> {
     let (uuid, _, _) = trigger_runnable_inner(
         db,
@@ -558,6 +561,7 @@ pub async fn trigger_runnable(
         error_handler_path,
         error_handler_args,
         trigger_path,
+        job_id,
     )
     .await?;
     Ok((StatusCode::CREATED, uuid.to_string()).into_response())
@@ -590,6 +594,7 @@ pub async fn trigger_runnable_and_wait_for_result(
         error_handler_path,
         error_handler_args,
         trigger_path,
+        None,
     )
     .await?;
     let (result, success) =
@@ -630,6 +635,7 @@ pub async fn trigger_runnable_and_wait_for_raw_result(
         error_handler_path,
         error_handler_args,
         trigger_path,
+        None,
     )
     .await?;
 
@@ -670,9 +676,10 @@ async fn trigger_script_internal(
     error_handler_path: Option<&str>,
     error_handler_args: Option<&sqlx::types::Json<HashMap<String, Box<RawValue>>>>,
     trigger_path: String,
+    job_id: Option<Uuid>,
 ) -> Result<(Uuid, Option<bool>)> {
     if retry.is_none() && error_handler_path.is_none() {
-        let run_query = RunJobQuery::default();
+        let run_query = RunJobQuery { job_id, ..Default::default() };
         let path = StripPath(script_path.to_string());
         run_script_by_path_inner(
             authed,
@@ -696,6 +703,7 @@ async fn trigger_script_internal(
             error_handler_path,
             error_handler_args,
             trigger_path,
+            job_id,
         )
         .await
     }
@@ -712,6 +720,7 @@ async fn trigger_script_with_retry_and_error_handler(
     error_handler_path: Option<&str>,
     error_handler_args: Option<&sqlx::types::Json<HashMap<String, Box<RawValue>>>>,
     trigger_path: String,
+    job_id: Option<Uuid>,
 ) -> Result<(Uuid, Option<bool>)> {
     #[cfg(feature = "enterprise")]
     check_license_key_valid().await?;
@@ -805,7 +814,7 @@ async fn trigger_script_with_retry_and_error_handler(
         None,
         None,
         None,
-        None,
+        job_id,
         false,
         false,
         None,
diff --git a/backend/windmill-api/src/triggers/websocket/listener.rs b/backend/windmill-api/src/triggers/websocket/listener.rs
index ae8ba01d2e..80eee431c4 100644
--- a/backend/windmill-api/src/triggers/websocket/listener.rs
+++ b/backend/windmill-api/src/triggers/websocket/listener.rs
@@ -450,6 +450,7 @@ impl Listener for WebsocketTrigger {
                 error_handler_path,
                 error_handler_args,
                 format!("websocket_trigger/{}", listening_trigger.path),
+                None,
             )
             .await?;
         }