Prevent blocking forEach loops

@vanchi-zendesk