No free pass for the safety bubble while syncing (should help prevent #570)