diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index a42c3a3..628e14f 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -25,7 +25,9 @@ void InternalShot(Creature* c,
             return;
         }
     }
-    c->room->frame_event.AddShot(c);
+    if (skill_id == 0) {
+        c->room->frame_event.AddShot(c);
+    }
     for (auto& tuple : weapon_meta->bullet_born_offset) {
         a8::Vec2 bullet_born_offset = a8::Vec2(std::get<0>(tuple), std::get<1>(tuple));
         bullet_born_offset.Rotate(c->attack_dir.CalcAngle(a8::Vec2::UP));
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 40e4235..951d4b9 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -2180,10 +2180,12 @@ void Room::NotifyGameStart()
                  if (buff_meta) {
                      for (auto& pair : room->human_hash_) {
                          a8::UnSetBitFlag(pair.second->status, HS_DisableAttack);
+                         #if 0
                          pair.second->AddBuff(pair.second,
                                               buff_meta,
                                               1,
                                               nullptr);
+                         #endif
                      }
                  }
              }