this G-code modification solved it for me:
It shortens the line on the way back so it’s less likely to drag the whole line with it.