diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 3ef8059..7917bac 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -394,6 +394,10 @@ void Player::Shot()
         }
         break;
     }
+    if (curr_weapon->weapon_idx != 0 &&
+        curr_weapon->ammo <= 0) {
+        AutoLoadingBullet();
+    }
     last_shot_frameno_ = room->frame_no;
     need_sync_active_player = true;
 }