diff --git a/source/WorldServer/Entity.cpp b/source/WorldServer/Entity.cpp
index 237e60d..d5e0c49 100644
--- a/source/WorldServer/Entity.cpp
+++ b/source/WorldServer/Entity.cpp
@@ -1065,7 +1065,7 @@ void Entity::InCombat(bool val){
 	
 	bool update_regen = false;
 	if(GetInfoStruct()->get_engaged_encounter()) {
-		if(!IsAggroed() || !IsEngagedInEncounter()) {
+		if(!IsEngagedInEncounter()) {
 			GetInfoStruct()->set_engaged_encounter(0);
 			update_regen = true;
 		}
diff --git a/source/WorldServer/Player.cpp b/source/WorldServer/Player.cpp
index 824d5e3..30ea840 100644
--- a/source/WorldServer/Player.cpp
+++ b/source/WorldServer/Player.cpp
@@ -4166,7 +4166,7 @@ void Player::InCombat(bool val, bool range) {
 	
 	bool update_regen = false;
 	if(GetInfoStruct()->get_engaged_encounter()) {
-		if(!IsAggroed() || !IsEngagedInEncounter()) {
+		if(!IsEngagedInEncounter()) {
 			GetInfoStruct()->set_engaged_encounter(0);
 			update_regen = true;
 		}