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 ded2387..1b56374 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
@@ -57,6 +57,9 @@ fun Routing.wsSongListRoutes() {
             for (frame in ws.incoming) {
                 if (frame is Text) {
                     val message = frame.readText()
+                    if(message == "ping") {
+                        return true
+                    }
                     val data = Json.decodeFromString<SongRequest>(message)
                     if (data.type == SongType.ACK.value) {
                         return true // ACK received
diff --git a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongRoutes.kt b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongRoutes.kt
index d379cf1..111d052 100644
--- a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongRoutes.kt
+++ b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSSongRoutes.kt
@@ -98,7 +98,7 @@ fun Routing.wsSongRoutes() {
             for (frame in incoming) {
                 when(frame) {
                     is Frame.Text -> {
-                        if(frame.readText() == "ping") {
+                        if(frame.readText().trim() == "ping") {
                             send("pong")
                         }
                     }
diff --git a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSTimerRoutes.kt b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSTimerRoutes.kt
index 06ec67f..243b30f 100644
--- a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSTimerRoutes.kt
+++ b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/WSTimerRoutes.kt
@@ -75,7 +75,7 @@ fun Routing.wsTimerRoutes() {
             for (frame in incoming) {
                 when(frame) {
                     is Frame.Text -> {
-                        if(frame.readText() == "ping") {
+                        if(frame.readText().trim() == "ping") {
                             send("pong")
                         }
                     }