diff --git a/src/servers/sapphire_zone/Actor/PlayerSql.cpp b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
index 1a325350..404f60dc 100644
--- a/src/servers/sapphire_zone/Actor/PlayerSql.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
@@ -125,6 +125,10 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
    m_birthDay = res->getUInt8( "BirthDay" );
    m_birthMonth = res->getUInt8( "BirthMonth" );
    m_status = static_cast< ActorStatus >( res->getUInt( "Status" ) );
+
+   if( m_status == Entity::Chara::ActorStatus::EmoteMode )
+      m_status = Entity::Chara::ActorStatus::Idle;
+
    m_class = static_cast< ClassJob >( res->getUInt( "Class" ) );
    m_homePoint = res->getUInt8( "Homepoint" );
 
diff --git a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
index 1a6e8820..52aefcdf 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
@@ -175,6 +175,7 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR
        {
           player.setPersistentEmote( 0 );
           player.emoteInterrupt();
+          player.setStatus( Entity::Chara::ActorStatus::Idle );
           auto pSetStatusPacket = boost::make_shared< ActorControlPacket142 >( player.getId(),
                                                                               SetStatus,
                                                                               static_cast< uint8_t >( Entity::Chara::ActorStatus::Idle ) );