diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f4e0682ee6..709dfd3844 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10421,8 +10421,19 @@
         <key>Type</key>
         <string>S32</string>
         <key>Value</key>
-        <integer>512</integer>
+        <integer>1024</integer>
     </map>
+	<key>RenderHeroProbeDistance</key>
+	<map>
+		<key>Comment</key>
+		<string>Distance in meters for hero probes to render out to.</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>F32</string>
+		<key>Value</key>
+		<real>16</real>
+	</map>
     <key>RenderReflectionProbeVolumes</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llheroprobemanager.cpp b/indra/newview/llheroprobemanager.cpp
index 59345ca35f..dec75f5d2b 100644
--- a/indra/newview/llheroprobemanager.cpp
+++ b/indra/newview/llheroprobemanager.cpp
@@ -436,7 +436,7 @@ void LLHeroProbeManager::initReflectionMaps()
     {
         mReset = false;
         mReflectionProbeCount = count;
-        mProbeResolution = nhpo2(1024);
+        mProbeResolution      = gSavedSettings.getS32("RenderHeroProbeResolution");
         mMaxProbeLOD = log2f(mProbeResolution) - 1.f; // number of mips - 1
 
         mTexture = new LLCubeMapArray();
@@ -457,7 +457,7 @@ void LLHeroProbeManager::initReflectionMaps()
         
         mDefaultProbe->mCubeIndex = 0;
         mDefaultProbe->mCubeArray = mTexture;
-        mDefaultProbe->mDistance = 12.f;
+        mDefaultProbe->mDistance  = gSavedSettings.getF32("RenderHeroProbeDistance");
         mDefaultProbe->mRadius = 4096.f;
         mDefaultProbe->mProbeIndex = 0;
         touch_default_probe(mDefaultProbe);