diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 6ffc9bc7..f9fe374d 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -347,7 +347,8 @@ void Player::UpdateShot()
     if (dead ||
         downed ||
         HasBuffEffect(kBET_Jump) ||
-        HasBuffEffect(kBET_Fly)) {
+        HasBuffEffect(kBET_Fly) ||
+        HasBuffEffect(kBET_InWater)) {
         shot_start = false;
         SetShotHold(false);
         series_shot_frames = 0;