diff --git a/src/modules/Elsa.Workflows.Core/Activities/Flowchart/Activities/Flowchart.cs b/src/modules/Elsa.Workflows.Core/Activities/Flowchart/Activities/Flowchart.cs
index c839e96fd..f927af9f0 100644
--- a/src/modules/Elsa.Workflows.Core/Activities/Flowchart/Activities/Flowchart.cs
+++ b/src/modules/Elsa.Workflows.Core/Activities/Flowchart/Activities/Flowchart.cs
@@ -141,7 +141,8 @@ public class Flowchart : Container
         var logger = context.GetRequiredService<ILogger<Flowchart>>();
         var loggerScopeState = new Dictionary<string, object>
         {
-            ["ThreadId"] = Thread.CurrentThread.ManagedThreadId,
+            ["ThreadId"] = Environment.CurrentManagedThreadId,
+            ["TaskId"] = Task.CurrentId?.ToString() ?? "N/A",
             ["ActivityId"] = Id,
             ["ActivityInstanceId"] = context.TargetContext.Id
         };