I have had this issue too swimming.

It usually happens when I ride and then I hop in for a swim.

Someone told me it's because I am pointing my foot TOO MUCH... I'm too tense. So, you might want to think about not pointing your foot as much... but not flatten the foot out.

It sort of worked for me.

Good luck!