diff --git a/src/modules/Elsa.Workflows.Management/Activities/SetOutput/SetOutput.cs b/src/modules/Elsa.Workflows.Management/Activities/SetOutput/SetOutput.cs
index a388c4bc5..bf9f83851 100644
--- a/src/modules/Elsa.Workflows.Management/Activities/SetOutput/SetOutput.cs
+++ b/src/modules/Elsa.Workflows.Management/Activities/SetOutput/SetOutput.cs
@@ -59,7 +59,7 @@ public class SetOutput : CodeActivity
             return;
         
         var ancestorOutput = (Output)ancestorOutputDescriptor.ValueGetter(ancestorActivity)!;
-        ancestorContext.Set(ancestorOutput, outputValue);
+        ancestorContext.Set(ancestorOutput, outputValue, outputName);
 
         // If the ancestor activity is the root workflow, we need to update the workflow execution context's output collection as well.
         if (ancestorContext.ParentActivityExecutionContext == null)
diff --git a/src/modules/Elsa.Workflows.Management/Activities/WorkflowDefinitionActivity/WorkflowDefinitionActivity.cs b/src/modules/Elsa.Workflows.Management/Activities/WorkflowDefinitionActivity/WorkflowDefinitionActivity.cs
index 7ba11bfde..76b295ae5 100644
--- a/src/modules/Elsa.Workflows.Management/Activities/WorkflowDefinitionActivity/WorkflowDefinitionActivity.cs
+++ b/src/modules/Elsa.Workflows.Management/Activities/WorkflowDefinitionActivity/WorkflowDefinitionActivity.cs
@@ -67,21 +67,16 @@ public class WorkflowDefinitionActivity : Composite, IInitializable
         foreach (var outputDescriptor in activityExecutionContext.ActivityDescriptor.Outputs)
         {
             var output = (Output?)outputDescriptor.ValueGetter(activityExecutionContext.Activity);
-            var value = activityExecutionContext.Get(output);
+            // If direct output mapping is used, we can read the output value directly from the memory.
+            var value = activityExecutionContext.Get(output) ?? activityExecutionContext.Get(outputDescriptor.Name);
 
-            if (value == null)
-            {
-                // If direct output mapping is used, we can read the output value directly from the memory.
-                value = activityExecutionContext.Get(outputDescriptor.Name);
-
-                // Make sure to select a parent scope to avoid naming collisions between outputs defined on the current scope and outputs defined on parent scopes.
-                var parentActivityExecutionContext = activityExecutionContext.ParentActivityExecutionContext ?? activityExecutionContext;
-                parentActivityExecutionContext.Set(output, value, outputDescriptor.Name);
-            }
-            else
-            {
-                activityExecutionContext.Set(output, value, outputDescriptor.Name);
-            }
+            // Make sure to select a parent scope to avoid naming collisions between outputs defined on the current scope and outputs defined on parent scopes.
+            var parentActivityExecutionContext = activityExecutionContext.ParentActivityExecutionContext?.GetAncestors()
+                .Any(x => x.ActivityDescriptor.Outputs.Any(y => y.Name == outputDescriptor.Name)) == true
+                ? activityExecutionContext.ParentActivityExecutionContext ?? activityExecutionContext
+                : activityExecutionContext;
+                
+            parentActivityExecutionContext.Set(output, value, outputDescriptor.Name);
         }
 
         // Complete this activity with the signal value.