diff --git a/indra/newview/llheroprobemanager.cpp b/indra/newview/llheroprobemanager.cpp
index be6eb48158..5d981c7ff1 100644
--- a/indra/newview/llheroprobemanager.cpp
+++ b/indra/newview/llheroprobemanager.cpp
@@ -221,6 +221,7 @@ void LLHeroProbeManager::update()
         else
         {
             mNearestHero = nullptr;
+            mDefaultProbe->mViewerObject = nullptr;
         }
 
         mHeroProbeStrength = 1;
@@ -229,6 +230,7 @@ void LLHeroProbeManager::update()
     else
     {
         mNearestHero = nullptr;
+        mDefaultProbe->mViewerObject = nullptr;
     }
     // </FS:Beq>
 }