diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index a4e7a7f3..675de756 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -1508,8 +1508,10 @@ void Creature::CheckSpecObject(int new_poly_flags)
                 if ((1 << i) == SAMPLE_POLYFLAGS_GLASS) {
                     if (a8::HasBitFlag(poly_ext_flags_, i)) {
                         RemoveBuffById(8058);
+                        RemoveBuffById(kInGrassBuffId);
                     } else {
                         TryAddBuffAndSetTime(this, 8058, 9999999);
+                        TryAddBuffAndSetTime(this, kInGrassBuffId, 9999999);
                     }
                 }
             }