diff --git a/source/WorldServer/Spawn.cpp b/source/WorldServer/Spawn.cpp
index 5c2a0ad..1e4672f 100644
--- a/source/WorldServer/Spawn.cpp
+++ b/source/WorldServer/Spawn.cpp
@@ -3945,7 +3945,7 @@ void Spawn::CheckEncounterState(Entity* victim, bool test_auto_lock) {
 			}
 			world.GetGroupManager()->ReleaseGroupLock(__FUNCTION__, __LINE__);
 		}
-		else if (attacker->GetInfoStruct()->get_group_solo_autolock()) {
+		else if (attacker->GetInfoStruct()->get_group_solo_autolock()|| attacker->GetInfoStruct()->get_group_autolock()) {
 			matchedAutoLock = true;
 			if (((NPC*)victim)->Brain()) {
 				((NPC*)victim)->Brain()->AddHate(attacker, 0);