It can be quite annoying, I agree.
I try to thoroughly go through the first 40% of the map as it happens like 9/10 times. But it has gotten better since they added checkpoints,- even though you have to walk quite a bit sometimes after taking the checkpoint, they do help
