diff --git a/Minecraft.Client/TrackedEntity.cpp b/Minecraft.Client/TrackedEntity.cpp
index 3aa33248d..98092c82b 100644
--- a/Minecraft.Client/TrackedEntity.cpp
+++ b/Minecraft.Client/TrackedEntity.cpp
@@ -519,6 +519,17 @@ void TrackedEntity::updatePlayer(EntityTracker *tracker, shared_ptr<ServerPlayer
 	{
 		seenBy.insert(sp);
 		shared_ptr<Packet> packet = getAddEntityPacket();
+
+		if (e->instanceof(eTYPE_SERVERPLAYER))
+		{
+			shared_ptr<AddPlayerPacket> addPlayerPkt = dynamic_pointer_cast<AddPlayerPacket>(packet);
+			if (addPlayerPkt != nullptr)
+			{
+                addPlayerPkt->xuid = INVALID_XUID;
+                addPlayerPkt->OnlineXuid = INVALID_XUID;
+			}
+		}
+
 		sp->connection->send(packet);
 
 		xap = e->xd;