diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index c9407f88f..e69a9877c 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -2825,14 +2825,9 @@ SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spell
         {
             if (!player)
                 return SPELL_FAILED_REQUIRES_AREA;
-            MapEntry const* mapEntry = sMapStore.LookupEntry(map_id);
-            if (!mapEntry)
-                return SPELL_FAILED_REQUIRES_AREA;
-            if (!mapEntry->IsBattleGround())
-                return SPELL_FAILED_REQUIRES_AREA;
             BattleGround* bg = player->GetBattleGround();
-            return map_id == 30 && bg && bg->GetStatus()!=STATUS_WAIT_JOIN ? SPELL_CAST_OK : SPELL_FAILED_REQUIRES_AREA;
-            break;
+            return map_id == 30 && bg
+                && bg->GetStatus() != STATUS_WAIT_JOIN ? SPELL_CAST_OK : SPELL_FAILED_REQUIRES_AREA;
         }
         case 23333:                                         // Warsong Flag
         case 23335:                                         // Silverwing Flag
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index fefeeb2af..8a14f89ee 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 "8613"
+ #define REVISION_NR "8614"
 #endif // __REVISION_NR_H__