diff --git a/indra/llappearance/llwearabledata.h b/indra/llappearance/llwearabledata.h
index eaafcc5e71..a978a61f24 100644
--- a/indra/llappearance/llwearabledata.h
+++ b/indra/llappearance/llwearabledata.h
@@ -67,6 +67,7 @@ public:
     bool            isOnTop(LLWearable* wearable) const;
 
     static const U32 MAX_CLOTHING_LAYERS = 60;
+    static constexpr U32 MAX_BODY_PARTS  = 4; // <FS:TJ/> Body part count is always 4
 
     //--------------------------------------------------------------------
     // Setters
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index d40586057d..f468100562 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -2911,7 +2911,7 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool enforce_item_restrictions,
     removeDuplicateItems(wear_items);
     removeDuplicateItems(obj_items);
     removeDuplicateItems(gest_items);
-    filterWearableItems(wear_items, 0, LLAgentWearables::MAX_CLOTHING_LAYERS);
+    filterWearableItems(wear_items, 0, LLAgentWearables::MAX_CLOTHING_LAYERS + LLAgentWearables::MAX_BODY_PARTS);
 // [/SL:KB]
 
     dumpItemArray(wear_items,"asset_dump: wear_item");