diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index 61163967..4749dc2d 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -18,7 +18,6 @@ namespace Core {
          enum ActorControlType : uint16_t
          {
             ToggleWeapon = 0x00,
-            ToggleAutoAttack = 0x01,
             SetStatus = 0x02,
             CastStart = 0x03,
             ToggleAggro = 0x04,
diff --git a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
index 27271528..e6a9a32d 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
@@ -150,6 +150,8 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR
           if( !emoteData )
              return;
 
+          player.emote( emoteId, targetId, isSilent );
+
           bool isPersistent = emoteData->emoteMode != 0;
 
           if( isPersistent )
@@ -164,8 +166,6 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR
                                                                   static_cast< uint8_t >( Entity::Chara::ActorStatus::EmoteMode ), emoteData->hasCancelEmote ? 1 : 0 ), true );
           }
 
-          player.emote( emoteId, targetId, isSilent );
-
           if( emoteData->drawsWeapon )
           {
              player.setStance( Entity::Chara::Stance::Active );