Optimize cases when no wait is required