diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 9b9af1d450..665af1f9b0 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -621,7 +621,7 @@ void WorldSession::HandleResurrectResponseOpcode(WorldPacket& recvData)
 	{
 		if (InstanceScript* instance = ressPlayer->GetInstanceScript())
 		{
-			if (instance->IsEncounterInProgress())
+			if ((instance->IsEncounterInProgress() && player->GetMap()->IsRaid()))
 			{
 				if (!instance->GetCombatResurrectionCharges())
 					return;
diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp
index 04e19c712c..a06d04a31b 100644
--- a/src/server/game/Instances/InstanceScript.cpp
+++ b/src/server/game/Instances/InstanceScript.cpp
@@ -316,7 +316,7 @@ bool InstanceScript::SetBossState(uint32 id, EncounterState state)
 					{
 						InitializeCombatResurrections(3, resInterval);
 					}
-					else
+					else if (instance->IsRaid())
 					{
 						InitializeCombatResurrections(1, resInterval);
 					}