diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 318b7c5ec9..08436b2386 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -255,6 +255,9 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
                 // Equipping weapons is handled by AiCombat. Anything else (lockpicks, probes) can't be used by NPCs anyway (yet)
                 continue;
 
+            if (iter.getType() == MWWorld::ContainerStore::Type_Weapon)
+                continue;
+
             if (slots_.at (*iter2)!=end())
             {
                 Ptr old = *slots_.at (*iter2);