diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index c31fcd98..9f595012 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -1283,6 +1283,9 @@ void Creature::UpdatePoisoning()
 void Creature::Shot(glm::vec3& target_dir, bool& shot_ok, float fly_distance, int trace_target_uniid)
 {
     shot_ok = false;
+    if (!GetCurrWeapon()) {
+        return;
+    }
     if (!GetCurrWeapon()->meta) {
         return;
     }