diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 149abaf57356a1ec41a9de67913c25ed03b036af..d7af7a42d12cf1cf10b4714bcfd7602a331c20aa 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4416,7 +4416,9 @@ void LLVOVolume::updateReflectionProbePtr()
 		{
 			// Geenz: This is a special case - what we want here is a hero probe.
 			// What we want to do here is instantiate a hero probe from the hero probe manager.
-            mIsHeroProbe = gPipeline.mHeroProbeManager.registerViewerObject(this);
+            
+            if (!mIsHeroProbe)
+                mIsHeroProbe = gPipeline.mHeroProbeManager.registerViewerObject(this);
 		}
     }
     else if (mReflectionProbe.notNull() || getReflectionProbeIsMirror())