diff --git a/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt b/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt
index a5f244ae..46c8d1c5 100644
--- a/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt
+++ b/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt
@@ -127,7 +127,7 @@ class Maimai2(
                     user = repos.userData.findByCardExtId(myCard.extId).orElse(null) ?: (404 - "User not found")
                     propertyKey = "favorite_rival"
                 }
-            val myRivalList = myRival.propertyValue.split(',').toMutableSet()
+            val myRivalList = myRival.propertyValue.split(',').filter { it.isNotEmpty() }.toMutableSet()
 
             if (isAdd && myRivalList.size >= 4) {
                 (400 - "Rival list is full")
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserFavoriteItemHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserFavoriteItemHandler.kt
index 3e60f29f..4a715d9b 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserFavoriteItemHandler.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserFavoriteItemHandler.kt
@@ -18,7 +18,7 @@ class GetUserFavoriteItemHandler(val repos: Mai2Repos) : BaseHandler {
             else -> Optional.empty()
         }()?.let { fav ->
             val v = fav.propertyValue
-            if (v.isNotBlank()) v.split(",").dropLastWhile { it.isEmpty() }.mapIndexed { i, record ->
+            if (v.isNotBlank()) v.split(",").filter { it.isNotEmpty() }.mapIndexed { i, record ->
                 mapOf("id" to record.toInt(), "orderId" to i) }
             else null
         } ?: emptyList()