diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 6a267fe6a..6a4a5e12d 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -1261,9 +1261,8 @@ bool DungeonMap::CanEnter(Player *player)
         return false;
     }
 
-    // cannot enter while players in the instance are in combat
-    Group *pGroup = player->GetGroup();
-    if(pGroup && pGroup->InCombatToInstance(GetInstanceId()) && player->isAlive() && player->GetMapId() != GetId())
+    // cannot enter while an encounter in the instance is in progress
+    if (!player->isGameMaster() && GetInstanceData() && GetInstanceData()->IsEncounterInProgress() && player->GetMapId() != GetId())
     {
         player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT);
         return false;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 99f9a8889..d651e33e1 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 "11782"
+ #define REVISION_NR "11783"
 #endif // __REVISION_NR_H__