diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 365be045..ddb8e493 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -922,6 +922,9 @@ bool Creature::InternalCanUseSkill(Skill* skill)
     if (playing_skill) {
         return false;
     }
+    if (HasBuffEffect(kBET_InWater)) {
+        return false;
+    }
     if (IsHuman() && AsHuman()->downed) {
         return false;
     }
@@ -1422,7 +1425,8 @@ void Creature::Shot(glm::vec3& target_dir, bool& shot_ok, float fly_distance, in
     }
 
     if (HasBuffEffect(kBET_Jump) ||
-        HasBuffEffect(kBET_Fly)) {
+        HasBuffEffect(kBET_Fly) ||
+        HasBuffEffect(kBET_InWater)) {
         return;
     }