diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 9ecbdd6d4..54c86fa87 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -4552,6 +4552,8 @@ void Player::RepopAtGraveyard()
             GetSession()->SendPacket(&data);
         }
     }
+    else if(GetPositionZ() < -500.0f)
+        TeleportTo(m_homebindMapId, m_homebindX, m_homebindY, m_homebindZ, GetOrientation());
 }
 
 void Player::JoinedChannel(Channel *c)