diff --git a/utilities/aws_lambda/task_handler.py b/utilities/aws_lambda/task_handler.py
index ada8562e..f2064f57 100644
--- a/utilities/aws_lambda/task_handler.py
+++ b/utilities/aws_lambda/task_handler.py
@@ -67,16 +67,17 @@ def task_handler(
 
                     try:
                         if pass_task_orchestrator:
-                            work = lambda body=body, t=task: func(
-                                body, context, orchestrator, t.id
+                            orchestrator.run_subtask(
+                                subtask.id,
+                                work=lambda: func(body, context, orchestrator, task.id),
+                                cloud_logs_url=cloud_logs_url,
                             )
                         else:
-                            work = lambda body=body: func(body, context)
-                        orchestrator.run_subtask(
-                            subtask.id,
-                            work=work,
-                            cloud_logs_url=cloud_logs_url,
-                        )
+                            orchestrator.run_subtask(
+                                subtask.id,
+                                work=lambda: func(body, context),
+                                cloud_logs_url=cloud_logs_url,
+                            )
                     except Exception:
                         logger.exception(
                             "subtask failed (task_source=%s source_id=%s)",