diff --git a/Minecraft.Client/PlayerList.cpp b/Minecraft.Client/PlayerList.cpp
index ba82ec6ac..4dd3a0c33 100644
--- a/Minecraft.Client/PlayerList.cpp
+++ b/Minecraft.Client/PlayerList.cpp
@@ -86,6 +86,7 @@ PlayerList::~PlayerList()
 
 bool PlayerList::placeNewPlayer(Connection *connection, shared_ptr<ServerPlayer> player, shared_ptr<LoginPacket> packet)
 {
+	// todo: we should move emit player join event here
 	CompoundTag *playerTag = load(player);
 
 	bool newPlayer = playerTag == nullptr;
@@ -283,7 +284,9 @@ bool PlayerList::placeNewPlayer(Connection *connection, shared_ptr<ServerPlayer>
 
 	// 4J-PB - removed, since it needs to be localised in the language the client is in
 	//server->players->broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(L"�e" + playerEntity->name + L" joined the game.") ) );
+#if !(defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD))
 	broadcastAll(std::make_shared<ChatPacket>(player->name, ChatPacket::e_ChatPlayerJoinedGame));
+#endif
 
 	MemSect(14);
 	add(player);