diff --git a/EpinelPS/LobbyServer/LobbyUser/EnterLobbyServer.cs b/EpinelPS/LobbyServer/LobbyUser/EnterLobbyServer.cs
index 8f244b5..9c98d9c 100644
--- a/EpinelPS/LobbyServer/LobbyUser/EnterLobbyServer.cs
+++ b/EpinelPS/LobbyServer/LobbyUser/EnterLobbyServer.cs
@@ -17,6 +17,12 @@ namespace EpinelPS.LobbyServer.LobbyUser
 
             // NOTE: Keep this in sync with GetUser code
 
+            if (user.Nickname == null)
+            {
+                user.Nickname = "Unknown";
+                JsonDb.Save();
+            }
+
             ResEnterLobbyServer response = new()
             {
                 User = LobbyHandler.CreateNetUserDataFromUser(user),