1 files changed, 8 insertions, 7 deletions
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index 4da242569..0ea63a507 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -35,6 +35,7 @@
 #include "net/charserverhandler.h"
 #include "net/chathandler.h"
 #include "net/guildhandler.h"
+#include "net/net.h"
 #include "net/partyhandler.h"
 #include "net/serverfeatures.h"
 
@@ -84,20 +85,21 @@ static void outString(ChatTab *const tab,
             const Guild *const guild = localPlayer->getGuild();
             if (guild)
             {
+#ifdef TMWA_SUPPORT
                 if (guild->getServerGuild())
                 {
-                    if (!serverFeatures ||
-                        !serverFeatures->haveNativeGuilds())
-                    {
+                    if (Net::getNetworkType() == ServerType::TMWATHENA)
                         return;
-                    }
                     guildHandler->chat(str);
                 }
-#ifdef TMWA_SUPPORT
                 else if (guildManager)
                 {
                     guildManager->chat(str);
                 }
+#else  // TMWA_SUPPORT
+
+                if (guild->getServerGuild())
+                    guildHandler->chat(str);
 #endif  // TMWA_SUPPORT
             }
             break;
@@ -355,8 +357,7 @@ impHandler(createParty)
 impHandler(createGuild)
 {
     if (!guildHandler ||
-        !serverFeatures ||
-        !serverFeatures->haveNativeGuilds())
+        Net::getNetworkType() == ServerType::TMWATHENA)
     {
         return false;
     }