diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib
index 5bdefac..5bc1271 100644
Binary files a/Release/Plugins/RenX.Core.lib and b/Release/Plugins/RenX.Core.lib differ
diff --git a/RenX.Core/RenX_Functions.cpp b/RenX.Core/RenX_Functions.cpp
index e03a6c5..af09fde 100644
--- a/RenX.Core/RenX_Functions.cpp
+++ b/RenX.Core/RenX_Functions.cpp
@@ -879,7 +879,9 @@ std::chrono::milliseconds RenX::getServerTime(const RenX::PlayerInfo *player)
 
 Jupiter::StringS RenX::default_uuid_func(RenX::PlayerInfo *player)
 {
-	return Jupiter::StringS::Format("0x%.16llX", player->steamid);
+	if (player->steamid != 0U)
+		return Jupiter::StringS::Format("0x%.16llX", player->steamid);
+	return Jupiter::StringS();
 }
 
 double RenX::getKillDeathRatio(const RenX::PlayerInfo *player, bool includeSuicides)
diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp
index 945dde0..a1a276f 100644
--- a/RenX.Core/RenX_Server.cpp
+++ b/RenX.Core/RenX_Server.cpp
@@ -1376,10 +1376,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line)
 									if (steamid != 0)
 									{
 										player->steamid = steamid;
-										if (calc_uuid == RenX::default_uuid_func)
-											setUUID(player, this->formatSteamID(steamid));
-										else
-											this->setUUIDIfDifferent(player, calc_uuid(player));
+										this->setUUIDIfDifferent(player, calc_uuid(player));
 									}
 								}
 
@@ -1411,10 +1408,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line)
 									if (steamid != 0)
 									{
 										player->steamid = steamid;
-										if (calc_uuid == RenX::default_uuid_func)
-											setUUID(player, this->formatSteamID(steamid));
-										else
-											this->setUUIDIfDifferent(player, calc_uuid(player));
+										this->setUUIDIfDifferent(player, calc_uuid(player));
 									}
 								}