For ENG-4904, always wait