Reduced delay in auto hot goal wait