diff --git a/Source/Game/Achievements/CriteriaHandler.cs b/Source/Game/Achievements/CriteriaHandler.cs
index ebde5521f..bf0d62f91 100644
--- a/Source/Game/Achievements/CriteriaHandler.cs
+++ b/Source/Game/Achievements/CriteriaHandler.cs
@@ -892,6 +892,10 @@ namespace Game.Achievements
                 return false;
             }
 
+            if (criteria.Entry.EligibilityWorldStateID != 0)
+                if (Global.WorldStateMgr.GetValue(criteria.Entry.EligibilityWorldStateID, referencePlayer.GetMap()) != criteria.Entry.EligibilityWorldStateValue)
+                    return false;
+
             return true;
         }