diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp
index d682be5ed..d630f8c6e 100644
--- a/src/game/AchievementMgr.cpp
+++ b/src/game/AchievementMgr.cpp
@@ -331,6 +331,9 @@ bool AchievementCriteriaRequirement::Meets(uint32 criteria_id, Player const* sou
             if (!source->IsInWorld())
                 return false;
             Map* map = source->GetMap();
+            // BattleGroundMap-class is instanceable, but no InstanceMap-class
+            if (map->IsBattleGroundOrArena())
+                return false;
             if (!map->Instanceable())
             {
                 sLog.outErrorDb("Achievement system call ACHIEVEMENT_CRITERIA_REQUIRE_INSTANCE_SCRIPT (%u) for achievement criteria %u for non-instance map %u",
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 72ddc8f35..fd688bba5 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9591"
+ #define REVISION_NR "9592"
 #endif // __REVISION_NR_H__