Resolve defer early if there is no modal CLUB-1339