diff --git a/inventory-service/main.py b/inventory-service/main.py
index 4845e5f2..3a78d2f4 100644
--- a/inventory-service/main.py
+++ b/inventory-service/main.py
@@ -3238,9 +3238,9 @@ async def search_items(
             # Jewelry: ObjectClass 4 (Jewelry) - rings, bracelets, necklaces, amulets
             conditions.append("object_class = 4")
         elif weapon_only:
-            # Weapons: ObjectClass 6 (MeleeWeapon), 7 (MissileWeapon), 8 (Caster) with max_damage > 0
+            # Weapons: ObjectClass 1 (MeleeWeapon), 9 (MissileWeapon), 31 (WandStaffOrb)
             conditions.append(
-                "(object_class IN (6, 7, 8) AND COALESCE(max_damage, 0) > 0)"
+                "object_class IN (1, 9, 31)"
             )
         elif clothing_only:
             # Clothing: ObjectClass 3 (Clothing) - shirts and pants only, exclude cloaks and robes