diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp
index 1245647250..4bb362a1c4 100644
--- a/src/game/ChatHandler.cpp
+++ b/src/game/ChatHandler.cpp
@@ -290,9 +290,16 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
                 if (guild)
                     guild->BroadcastToGuild(this, msg, lang == LANG_ADDON ? LANG_ADDON : LANG_UNIVERSAL);
 
-                if(sWorld.getConfig(CONFIG_CHATLOG_GUILD))
+                if(lang != LANG_ADDON && sWorld.getConfig(CONFIG_CHATLOG_GUILD))
+                {
                     sLog.outChat("[GUILD] Player %s tells guild %s: %s",
                         GetPlayer()->GetName(), guild->GetName().c_str(), msg.c_str());
+                }
+                else if (lang == LANG_ADDON && sWorld.getConfig(CONFIG_CHATLOG_ADDON))
+                {
+                    sLog.outChat("[ADDON] Player %s sends to guild %s: %s",
+                        GetPlayer()->GetName(), guild->GetName().c_str(), msg.c_str());
+                }
             }
 
             break;