diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 3e8f9448545..2ab6e93451f 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -4848,6 +4848,7 @@ void Player::RepopAtGraveyard()
     // and don't show spirit healer location
     if (ClosestGrave)
     {
+        bool updateVisibility = IsInWorld() && GetMapId() == ClosestGrave->map_id;
         TeleportTo(ClosestGrave->map_id, ClosestGrave->x, ClosestGrave->y, ClosestGrave->z, GetOrientation());
         if (isDead())                                       // not send if alive, because it used in TeleportTo()
         {
@@ -4858,7 +4859,8 @@ void Player::RepopAtGraveyard()
             data << ClosestGrave->z;
             GetSession()->SendPacket(&data);
         }
-        UpdateVisibilityAndView();
+        if (updateVisibility && IsInWorld())
+            UpdateVisibilityAndView();
     }
 }
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 304f20bab59..57fccd3334b 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12512"
+ #define REVISION_NR "12513"
 #endif // __REVISION_NR_H__