Music currently playing stops when going underwater in any biome

All music (not including the jukebox) abruptly stops when dropping underwater in any biome. I get that there is underwater music that is supposed to play, but in previous snapshots, the current playing track would first end, then the underwater music would start, not just having the current music stop when going underwater.