diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp
index d2de87fdc..fbc23b0e9 100644
--- a/src/game/ChatHandler.cpp
+++ b/src/game/ChatHandler.cpp
@@ -453,17 +453,21 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             std::string msg;
             recv_data >> msg;
 
-            if((msg.empty() || !_player->isAFK()) && !_player->isInCombat() )
+            if (!_player->isInCombat())
             {
-                if(!_player->isAFK())
+                if (!msg.empty() || !_player->isAFK())
                 {
-                    if(msg.empty())
-                        msg  = GetMangosString(LANG_PLAYER_AFK_DEFAULT);
-                    _player->afkMsg = msg;
+                    if (msg.empty())
+                        _player->afkMsg = GetMangosString(LANG_PLAYER_AFK_DEFAULT);
+                    else
+                        _player->afkMsg = msg;
+                }
+                if (msg.empty() || !_player->isAFK())
+                {
+                    _player->ToggleAFK();
+                    if (_player->isAFK() && _player->isDND())
+                        _player->ToggleDND();
                 }
-                _player->ToggleAFK();
-                if(_player->isAFK() && _player->isDND())
-                    _player->ToggleDND();
             }
         } break;
 
@@ -472,16 +476,17 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             std::string msg;
             recv_data >> msg;
 
-            if(msg.empty() || !_player->isDND())
+            if (!msg.empty() || !_player->isDND())
             {
-                if(!_player->isDND())
-                {
-                    if(msg.empty())
-                        msg  = GetMangosString(LANG_PLAYER_DND_DEFAULT);
+                if (msg.empty())
+                    _player->dndMsg = GetMangosString(LANG_PLAYER_DND_DEFAULT);
+                else
                     _player->dndMsg = msg;
-                }
+            }
+            if (msg.empty() || !_player->isDND())
+            {
                 _player->ToggleDND();
-                if(_player->isDND() && _player->isAFK())
+                if (_player->isDND() && _player->isAFK())
                     _player->ToggleAFK();
             }
         } break;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 5276b67a3..f882e642a 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 "10540"
+ #define REVISION_NR "10541"
 #endif // __REVISION_NR_H__