Yes. I think it is normal. The water isolates your ears from external sounds so you can hear your tinnitus stronger. Just like when you close you use earplugs.
When my mom puts in mustard oil drops instead of the stop and go ringing I regularly hear I hear this consrant high pitch noise (but that doesn't bother me as much as the actual ringing). I haven't been underwater so I can't give any experience there.