diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 9ec2a14cb..9b5c841d6 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -10075,7 +10075,6 @@ void CharmInfo::InitPetActionBar()
 
 void CharmInfo::InitEmptyActionBar()
 {
-    SetActionBar(ACTION_BAR_INDEX_START, COMMAND_ATTACK, ACT_COMMAND);
     for (uint32 x = ACTION_BAR_INDEX_START + 1; x < ACTION_BAR_INDEX_END; ++x)
         SetActionBar(x, 0, ACT_PASSIVE);
 }
@@ -10087,6 +10086,8 @@ void CharmInfo::InitPossessCreateSpells()
     if (m_unit->GetTypeId() == TYPEID_PLAYER)               // possessed players don't have spells, keep the action bar empty
         return;
 
+    SetActionBar(ACTION_BAR_INDEX_START, COMMAND_ATTACK, ACT_COMMAND);
+
     for (uint32 x = 0; x < CREATURE_MAX_SPELLS; ++x)
     {
         if (IsPassiveSpell(((Creature*)m_unit)->m_spells[x]))
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 06ce6beaf..dfa3d242c 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 "12219"
+ #define REVISION_NR "12220"
 #endif // __REVISION_NR_H__