diff --git a/Source/Game/Conditions/ConditionManager.cs b/Source/Game/Conditions/ConditionManager.cs
index bc08c4176..fae24c70f 100644
--- a/Source/Game/Conditions/ConditionManager.cs
+++ b/Source/Game/Conditions/ConditionManager.cs
@@ -2111,6 +2111,18 @@ namespace Game
                 }
             }
 
+            if (condition.CurrentPvpFaction != 0)
+            {
+                byte team;
+                if (player.GetMap().IsBattlegroundOrArena())
+                    team = player.m_playerData.ArenaFaction;
+                else
+                    team = (byte)player.GetTeamId();
+
+                if (condition.CurrentPvpFaction - 1 != team)
+                    return false;
+            }
+
             if (condition.PvpMedal != 0 && !Convert.ToBoolean((1 << (condition.PvpMedal - 1)) & player.m_activePlayerData.PvpMedals))
                 return false;