diff --git a/source/src/client.cpp b/source/src/client.cpp
index 0af31bf0..3a767e7a 100644
--- a/source/src/client.cpp
+++ b/source/src/client.cpp
@@ -184,7 +184,7 @@ void trydisconnect()
 
 void toserver(char *text) 
 { 
-    bool toteam = text && text[0] == '%';
+    bool toteam = text && text[0] == '%' && m_teammode;
     if(toteam) text++;
     conoutf("%s:\f%d %s", colorname(player1), toteam ? 1 : 0, text);
     addmsg(toteam ? SV_TEAMTEXT : SV_TEXT, "rs", text);