diff --git a/skyvern/forge/sdk/routes/streaming.py b/skyvern/forge/sdk/routes/streaming.py
index a5df5e99..8bbc3692 100644
--- a/skyvern/forge/sdk/routes/streaming.py
+++ b/skyvern/forge/sdk/routes/streaming.py
@@ -89,8 +89,6 @@ async def task_stream(
 
             if task.status == TaskStatus.running:
                 file_name = f"{task_id}.png"
-                if task.workflow_run_id:
-                    file_name = f"{task.workflow_run_id}.png"
                 screenshot = await app.STORAGE.get_streaming_file(organization_id, file_name)
                 if screenshot:
                     encoded_screenshot = base64.b64encode(screenshot).decode("utf-8")
diff --git a/skyvern/forge/sdk/workflow/models/block.py b/skyvern/forge/sdk/workflow/models/block.py
index d31b9697..1b3cdf82 100644
--- a/skyvern/forge/sdk/workflow/models/block.py
+++ b/skyvern/forge/sdk/workflow/models/block.py
@@ -985,9 +985,10 @@ class SendEmailBlock(Block):
         # Log file statistics
         LOG.info("SendEmailBlock: Total files attached", total_files=total_files)
         LOG.info("SendEmailBlock: Unique files (based on content) attached", unique_files=unique_files)
-        LOG.info(
-            "SendEmailBlock: Duplicate files (based on content) attached", duplicate_files_list=duplicate_files_list
-        )
+        if duplicate_files_list:
+            LOG.info(
+                "SendEmailBlock: Duplicate files (based on content) attached", duplicate_files_list=duplicate_files_list
+            )
 
         return msg