diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 9c4fa8fe8..2ea95ae4b 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -2989,7 +2989,7 @@ void AuraEffect::HandleFeignDeath(AuraApplication const* aurApp, uint8 mode, boo
         for (auto& pair : target->GetThreatMgr().GetThreatenedByMeList())
             pair.second->ScaleThreat(0.0f);
 
-        if (target->GetMap()->IsDungeon()) // feign death does not remove combat in dungeons
+        if (target->GetInstanceScript() && target->GetInstanceScript()->IsEncounterInProgress())
         {
             target->AttackStop();
             if (Player* targetPlayer = target->ToPlayer())