diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 83bb5dde..6240797f 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -1419,9 +1419,11 @@ void Creature::CheckSpecObject()
         int poly_idx = 0;
         dtPoly* poly = room->map_instance->GetPoly(GetPos().ToGlmVec3(), poly_idx);
         if (poly) {
+            #if 0
             if ((poly->flags & SAMPLE_POLYFLAGS_SWIM) == SAMPLE_POLYFLAGS_SWIM) {
                 a8::SetBitFlag(cell_flags_, kColliderTag_Water);
             }
+            #endif
         }
     }
     if (old_cell_flags != cell_flags_) {
@@ -1433,6 +1435,7 @@ void Creature::CheckSpecObject()
             }
         }
 
+        #if 0
         if (!a8::SameBitFlag(old_cell_flags, cell_flags_, kColliderTag_Water)) {
             if (a8::HasBitFlag(cell_flags_, kColliderTag_Water)) {
                 TryAddBuff(this, kInWaterBuffId);
@@ -1440,6 +1443,7 @@ void Creature::CheckSpecObject()
                 RemoveBuffById(kInWaterBuffId);
             }
         }
+        #endif
 
         if (!a8::SameBitFlag(old_cell_flags, cell_flags_, kColliderTag_Ice)) {
             if (a8::HasBitFlag(cell_flags_, kColliderTag_Ice)) {