Riptide trident stuck occasionally when placing water with command

The bug

Occasionally when using a trident with riptide the player gets stuck in the water block on which the trident is used. Note that this does not seem to happen with regular water but when a repeating command block places water level 6 at the players feet. From video analysis it appears that this occurs whenever the trident is used at the same time that the water block is placed. I have also tried teleporting the player up and forward 1 block the moment that a trident is used but it will still reset the player down to the water block and be stuck there.

How to reproduce

1. Place a command block on the ground that repeatedly places shallow water:

   /setblock ~1 ~ ~ repeating_command_block{Command:"setblock ~-1 ~ ~ water[level=6]",auto:1}

2. Give yourself a trident enchanted with riptide:

   /give @s trident{Enchantments:[{id:riptide,lvl:1}]}

3. Throw the trident while standing in the water placed by the command block
   → There is a chance you will get stuck in the floor instead of being launched