diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 819fe27606..5ff52cf5e2 100755
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -5392,6 +5392,12 @@ SpellCastResult Spell::CheckCast(bool strict)
                 }
                 break;
             }
+            case SPELL_EFFECT_TALENT_SPEC_SELECT:
+                // can't change during already started arena/battleground
+                if (Battleground const* bg = m_caster->ToPlayer()->GetBattleground())
+                    if (bg->GetStatus() == STATUS_IN_PROGRESS)
+                        return SPELL_FAILED_NOT_IN_BATTLEGROUND;
+                break;
             default:
                 break;
         }
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index af04f408aa..0f34ea7a55 100755
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -6933,14 +6933,6 @@ void Spell::EffectSpecCount(SpellEffIndex /*effIndex*/)
 
 void Spell::EffectActivateSpec(SpellEffIndex /*effIndex*/)
 {
-    // can't change during already started arena/battleground
-    if (Battleground const* bg = m_caster->ToPlayer()->GetBattleground())
-        if (bg->GetStatus() == STATUS_IN_PROGRESS)
-        {
-            SendCastResult(SPELL_FAILED_NOT_IN_BATTLEGROUND);
-            return;
-        }
-
     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;