Underwater music still plays after coming out of the water until the underwater music ends

After coming out of the water (ocean & river), underwater music will continue to play until the music ends. This is very disturbing because just imagine the player only goes into the ocean 20 seconds then out of the water where the player must wait a few minutes for the underwater music to end and then continue survival/creative music.