diff --git a/src/main/java/icu/samnyan/aqua/net/games/GameApiController.kt b/src/main/java/icu/samnyan/aqua/net/games/GameApiController.kt
index b9dbe7b6..159bb87c 100644
--- a/src/main/java/icu/samnyan/aqua/net/games/GameApiController.kt
+++ b/src/main/java/icu/samnyan/aqua/net/games/GameApiController.kt
@@ -158,7 +158,7 @@ abstract class GameApiController<T : IUserData>(val name: String, userDataClass:
             lastVersion = user.lastRomVersion,
             ratingComposition = ratingComp,
             recent = plays.sortedBy { it.userPlayDate.toString() }.takeLast(15).reversed(),
-            lastPlayedHost = us.userRepo.findByKeychip(user.lastClientId)?.username,
+            lastPlayedHost = user.lastClientId?.let { us.userRepo.findByKeychip(it)?.username },
             rival = rival
         )
     }
diff --git a/src/main/java/icu/samnyan/aqua/net/games/Models.kt b/src/main/java/icu/samnyan/aqua/net/games/Models.kt
index 19ff6662..fd7f68c3 100644
--- a/src/main/java/icu/samnyan/aqua/net/games/Models.kt
+++ b/src/main/java/icu/samnyan/aqua/net/games/Models.kt
@@ -91,7 +91,7 @@ interface IUserData {
     val lastRomVersion: String
     val totalScore: Long
     var card: Card?
-    val lastClientId: String
+    val lastClientId: String?
 }
 
 interface IGenericGamePlaylog {