Forced Teleporting Horse and Water

For the past few weeks, I have experienced a glitch that would teleport me and my horse on a previous body of water when I ride my horse again.
Even if I am blocks away from a body of water that I travel through with my horse, when I ride the horse on land, I would suddenly be teleported back to that same water. I already had a horse die from this glitch.