diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 4e75e33db..a3536a7bc 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -1822,7 +1822,8 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
 
         // If the map is not created, assume it is possible to enter it.
         // It will be created in the WorldPortAck.
-        Map *map = sMapMgr.FindMap(mapid);
+        DungeonPersistentState* state = GetBoundInstanceSaveForSelfOrGroup(mapid);
+        Map *map = sMapMgr.FindMap(mapid, state ? state->GetInstanceId() : 0);
         if (!map ||  map->CanEnter(this))
         {
             //lets reset near teleport flag if it wasn't reset during chained teleports
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 1c83202a6..f340c9746 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 "11607"
+ #define REVISION_NR "11608"
 #endif // __REVISION_NR_H__