[#877393] Review fix. Fixed a case where we could call next twice because of a hole in async logic.