diff --git a/common/src/main/kotlin/space/mori/chzzk_bot/common/events/SongEvents.kt b/common/src/main/kotlin/space/mori/chzzk_bot/common/events/SongEvents.kt
index 5e1f81c..cbe27f9 100644
--- a/common/src/main/kotlin/space/mori/chzzk_bot/common/events/SongEvents.kt
+++ b/common/src/main/kotlin/space/mori/chzzk_bot/common/events/SongEvents.kt
@@ -14,7 +14,6 @@ class SongEvent(
     val uid: String,
     val type: SongType,
     val reqUid: String?,
-    val reqName: String?,
     val current: YoutubeVideo? = null,
     val next: YoutubeVideo? = null,
     val delUrl: String? = null,
diff --git a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongListRoutes.kt b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongListRoutes.kt
index 2e07ac1..187e148 100644
--- a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongListRoutes.kt
+++ b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongListRoutes.kt
@@ -140,8 +140,7 @@ fun Routing.wsSongListRoutes() {
                                                     user.token!!,
                                                     SongType.ADD,
                                                     user.token,
-                                                    user.username,
-                                                    null,
+                                                    CurrentSong.getSong(user),
                                                     youtubeVideo
                                                 )
                                             )
@@ -151,6 +150,13 @@ fun Routing.wsSongListRoutes() {
                                     logger.debug("SongType.ADD Error: $uid $e")
                                 }
                             } else if (data.type == SongType.REMOVE.value && data.url != null) {
+                                val songs = SongListService.getSong(user)
+
+                                val exactSong = songs.firstOrNull { it.url == data.url }
+                                if (exactSong != null) {
+                                    SongListService.deleteSong(user, exactSong.uid, exactSong.name)
+                                }
+
                                 dispatcher.post(
                                     SongEvent(
                                         user.token!!,
@@ -158,7 +164,6 @@ fun Routing.wsSongListRoutes() {
                                         null,
                                         null,
                                         null,
-                                        null,
                                         data.url
                                     )
                                 )
@@ -185,7 +190,6 @@ fun Routing.wsSongListRoutes() {
                                         user.token!!,
                                         SongType.NEXT,
                                         song?.uid,
-                                        song?.reqName,
                                         youtubeVideo
                                     )
                                 )