diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 644906240..d0ae866b6 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -14878,6 +14878,9 @@ void Unit::RemoveCharmedBy(Unit* charmer)
 
     StopAttackingInvalidTarget();
 
+    // End stale combat refs between now-friendly units after faction restore
+    GetCombatManager().RevalidateCombat();
+
     Player* playerCharmer = charmer->ToPlayer();
     if (playerCharmer)
     {