Being in Elytra flight mode and using a Trident enchanted with Riptide while submerged in water sometimes exits Elytra flight mode

I initially noticed this while using Riptide to exit an ocean vertically and continued using Riptide without exiting the water and the same issue occurred. Seems to only be bugged in water blocks, leaving using Riptide in rain functioning as intended.
I am unsure whether having boots enchanted with Depth Strider 3 changes anything

Steps to Reproduce:

1. Find a large body of water

2. Give yourself a Trident with Riptide 3 and equip an elytra

3. Use the Elytra to glide into the body of water, not letting the bottom of your hitbox touch the top of any blocks

4. Use Riptide several times while swimming, pausing between each use with no additional input to observe if you have exited Elytra flight mode

5. Repeat Step 4 until described results are reached

Observed Results:  

Player eventually exits Elytra flight mode

Expected Results:  

Player stays in Elytra flight mode until landing on a block or Elytra is broken/unequipped.