ENG-5844: Snapshot race fix