diff --git a/src/client/component/chat.cpp b/src/client/component/chat.cpp
index 421d2fbb..67a4717d 100644
--- a/src/client/component/chat.cpp
+++ b/src/client/component/chat.cpp
@@ -56,6 +56,11 @@ namespace chat
 
 	const char* get_client_name(const uint64_t xuid)
 	{
+		if (xuid == 0xFFFFFFFF)
+		{
+			return "Server";
+		}
+
 		if (xuid < 19 && !game::is_server())
 		{
 			char buffer[256];