Bug with music

Whenever a player is in any body of water, the normal overworld music will stop playing and the ocean theme will play. (It doesn't matter which biome I'm in, it always happens) When I get out of the water, The music will continue until the end, unless I use the /stopsound command. This is annoying, especially if I'm just trying to go mining and I accidentally submerge myself in water.