--- a/src/npcmove.cpp
+++ b/src/npcmove.cpp
@@ -3513,7 +3513,7 @@
     // if they don't have a weapon with appropriate range/ammo.
     visit_items( [&compare_weapon, this ]( item * node ) {
         // For worn items, only compare if they have a weapon category defined.
-        if( is_worn( *node ) && node->type->weapon_category.empty() ) {
+        if( is_worn( *node ) && !( node->get_use( "holster" ) ) && node->type->weapon_category.empty() ) {
             return VisitResponse::SKIP;
         }
         // Otherwise, compare any melee usable item, guns or holstered items