diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 6240797f..ef2fc7a6 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -1435,15 +1435,13 @@ 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);
+                TryAddBuff(this, kInWater1BuffId);
             } else {
-                RemoveBuffById(kInWaterBuffId);
+                RemoveBuffByEffectId(kBET_InWater);
             }
         }
-        #endif
 
         if (!a8::SameBitFlag(old_cell_flags, cell_flags_, kColliderTag_Ice)) {
             if (a8::HasBitFlag(cell_flags_, kColliderTag_Ice)) {