Being misplaced when entering Nether or The End

Ever since the new update every time I enter the Nether or The End dimensions I'm not placed by the original spawn point. When I enter the end I'm being placed at least 1200 blocks away from my original spawn point, and in the nether, I'm being placed 600 blocks away. I've lost a week's worth of building due to me having to load my last backup because I spawned beside a group of wither skeletons who killed me.