diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
index e0abd24ed..0b0098b9b 100644
--- a/src/server/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
@@ -566,6 +566,12 @@ void WorldSession::LogoutPlayer(bool save)
         {
             _player->GetGroup()->SendUpdate();
             _player->GetGroup()->ResetMaxEnchantingLevel();
+			
+            Map::PlayerList const &playerList = _player->GetMap()->GetPlayers();
+
+            if (_player->GetMap()->IsDungeon() || _player->GetMap()->IsRaidOrHeroicDungeon())
+                if (playerList.isEmpty())
+                    _player->TeleportToEntryPoint();
         }
 
         //! Broadcast a logout message to the player's friends