diff --git a/src/core/Elsa.Abstractions/Services/CompositeActivity.cs b/src/core/Elsa.Abstractions/Services/CompositeActivity.cs
index 9ba1ca191..e666cd2f1 100644
--- a/src/core/Elsa.Abstractions/Services/CompositeActivity.cs
+++ b/src/core/Elsa.Abstractions/Services/CompositeActivity.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
 using System.Threading.Tasks;
 using Elsa.ActivityResults;
 using Elsa.Builders;
@@ -65,7 +66,12 @@ namespace Elsa.Services
 
             if (finishOutput != null)
             {
-                outcomes.AddRange(finishOutput.Outcomes);
+                // If any outcomes were specified explicitly, we use them instead of Done.
+                var finishOutcomes = finishOutput.Outcomes.ToList();
+
+                if (finishOutcomes.Any())
+                    outcomes = finishOutcomes;
+                
                 output = finishOutput.Output;
             }