Fish above water quest - 2nd part

This quest has 4 steps:

  1. take quest
  2. /wave
  3. grab surfboard
  4. go to point A
  5. go back where you start and return the quest

Whenever you break the surfboard - hit shoreline, you are unable to take another surfboard so you have to abandon the quest and start it over. This accident happened to me already few times bcs the quest starts really close to the shoreline.

Expected behaviour:
Poisibility to take the surfboard again?