diff --git a/skyvern/forge/agent.py b/skyvern/forge/agent.py
index 84c7be08..1a6b5e08 100644
--- a/skyvern/forge/agent.py
+++ b/skyvern/forge/agent.py
@@ -309,8 +309,6 @@ class ForgeAgent:
                 status=StepStatus.canceled,
                 is_last=True,
             )
-            # We don't send task response for now as the task is canceled
-            # TODO: shall we send task response here?
             await self.clean_up_task(
                 task=task,
                 last_step=step,
@@ -1687,7 +1685,7 @@ class ForgeAgent:
             try:
                 async with asyncio.timeout(SAVE_DOWNLOADED_FILES_TIMEOUT):
                     await app.STORAGE.save_downloaded_files(
-                        task.organization_id, task_id=task.task_id, workflow_run_id=None
+                        task.organization_id, task_id=task.task_id, workflow_run_id=task.workflow_run_id
                     )
             except asyncio.TimeoutError:
                 LOG.warning(
diff --git a/skyvern/forge/sdk/workflow/models/block.py b/skyvern/forge/sdk/workflow/models/block.py
index 5ccfcf75..e8c81ef7 100644
--- a/skyvern/forge/sdk/workflow/models/block.py
+++ b/skyvern/forge/sdk/workflow/models/block.py
@@ -640,7 +640,7 @@ class BaseTaskBlock(Block):
                         downloaded_file_urls = await app.STORAGE.get_downloaded_files(
                             organization_id=workflow_run.organization_id,
                             task_id=updated_task.task_id,
-                            workflow_run_id=None,
+                            workflow_run_id=workflow_run_id,
                         )
                 except asyncio.TimeoutError:
                     LOG.warning("Timeout getting downloaded files", task_id=updated_task.task_id)
@@ -699,8 +699,9 @@ class BaseTaskBlock(Block):
                         downloaded_file_urls = await app.STORAGE.get_downloaded_files(
                             organization_id=workflow_run.organization_id,
                             task_id=updated_task.task_id,
-                            workflow_run_id=None,
+                            workflow_run_id=workflow_run_id,
                         )
+
                 except asyncio.TimeoutError:
                     LOG.warning("Timeout getting downloaded files", task_id=updated_task.task_id)