diff --git a/Minecraft.Client/PlayerConnection.cpp b/Minecraft.Client/PlayerConnection.cpp
index 6838fc65c..7c7e97973 100644
--- a/Minecraft.Client/PlayerConnection.cpp
+++ b/Minecraft.Client/PlayerConnection.cpp
@@ -921,7 +921,7 @@ void PlayerConnection::handleChat(shared_ptr<ChatPacket> packet)
 		{
 			if (formatted.empty())
 				formatted = L"<" + player->name + L"> " + message;
-			server->getPlayers()->broadcastAll(std::make_shared<ChatPacket>(formatted));
+            server->getPlayers()->broadcastAll(std::make_shared<ChatPacket>(app.FormatChatMessage(formatted, false)));
 		}
 	}
 #else
@@ -932,6 +932,7 @@ void PlayerConnection::handleChat(shared_ptr<ChatPacket> packet)
 	{
 		disconnect(DisconnectPacket::eDisconnect_None); // spam
 	}
+#endif
 }
 
 void PlayerConnection::handleCommand(const wstring& message)