1 files changed, 6 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index cb718546146..c3073251f34 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -8526,19 +8526,23 @@ void Unit::SetCharm(Unit* pet)
 
 void Unit::AddPlayerToVision(Player* plr)
 {
-    setActive(true);
     if(m_sharedVision.empty())
+    {
+        setActive(true);
         SetWorldObject(true);
+    }
     m_sharedVision.push_back(plr);
     plr->SetFarsightTarget(this);
 }
 
 void Unit::RemovePlayerFromVision(Player* plr)
 {
-    setActive(false);
     m_sharedVision.remove(plr);
     if(m_sharedVision.empty())
+    {
+        setActive(false);
         SetWorldObject(false);
+    }
     plr->ClearFarsight();
 }