diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 88104e99ca7..de0c7544963 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -3721,6 +3721,10 @@ bool LLViewerRegion::bakesOnMeshEnabled() const
 
 bool LLViewerRegion::meshRezEnabled() const
 {
+    if(!mSimulatorFeaturesReceived)
+    {
+        return true;
+    }
     return (mSimulatorFeatures.has("MeshRezEnabled") &&
                 mSimulatorFeatures["MeshRezEnabled"].asBoolean());
 }