diff --git a/src/activities/Elsa.Activities.ControlFlow/Activities/ForEach.cs b/src/activities/Elsa.Activities.ControlFlow/Activities/ForEach.cs index 888fc2b80..46a738c34 100644 --- a/src/activities/Elsa.Activities.ControlFlow/Activities/ForEach.cs +++ b/src/activities/Elsa.Activities.ControlFlow/Activities/ForEach.cs @@ -48,6 +48,11 @@ namespace Elsa.Activities.ControlFlow.Activities var collection = await expressionEvaluator.EvaluateAsync(CollectionExpression, context, cancellationToken); var index = CurrentIndex; + if (collection.Count == 0) + { + return Done(); + } + if (index >= collection.Count) { context.EndScope();