diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index a9c740eec5..3feb484135 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1098,15 +1098,20 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it
 
         const LLWearableType::EType type = new_wearable->getType();
         //<FS:Beq> BOM fallback legacy opensim
-        if(!gAgent.getRegion()->bakesOnMeshEnabled())
+        #ifdef OPENSIM
+        if (!LLGridManager::getInstance()->isInSecondLife())
         {
-            if(type == LLWearableType::WT_UNIVERSAL)
+            if(!gAgent.getRegion()->bakesOnMeshEnabled())
             {
-                LL_DEBUGS("Avatar") << "Universal wearable not supported on this region - ignoring." << LL_ENDL;
-                mismatched++;
-                continue;
+                if(type == LLWearableType::WT_UNIVERSAL)
+                {
+                    LL_DEBUGS("Avatar") << "Universal wearable not supported on this region - ignoring." << LL_ENDL;
+                    mismatched++;
+                    continue;
+                }
             }
         }
+        #endif
         //</FS:Beq>
         if (type < 0 || type>=LLWearableType::WT_COUNT)
         {
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index bec3cd181b..be87303f36 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -3978,7 +3978,7 @@ bool LLViewerRegion::meshUploadEnabled() const
 
 bool LLViewerRegion::bakesOnMeshEnabled() const
 {
-    return (mSimulatorFeatures.has("BakesOnMeshEnabled") &&
+    return (mSimulatorFeaturesReceived && mSimulatorFeatures.has("BakesOnMeshEnabled") && // FIRE-35111 (bugsplat) checking bakes on mesh feature before features received.
         mSimulatorFeatures["BakesOnMeshEnabled"].asBoolean());
 }