Elytra does not work in water

Elytra deactivates upon hitting water. Upon coming in contact in water mid-flight with an elytra, one will stop their flying even if going rather quickly through it. This would not normally be an issue if firework boosts were not a thing. Launching from the water is convenient if not entertaining sometimes when the user carries many fireworks.
Steps to reproduce
Fly elytra through water
Come in contact with water