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 2ea2a32..7c9378e 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
@@ -16,7 +16,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withTimeoutOrNull
 import kotlinx.io.IOException
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
@@ -78,26 +77,23 @@ fun Routing.wsSongListRoutes() {
     }
 
     suspend fun waitForAck(ws: WebSocketServerSession, expectedType: Int): Boolean {
-        return withTimeoutOrNull(5000L) { // 5초 타임아웃
-            try {
-                for (frame in ws.incoming) {
-                    if (frame is Text) {
-                        val message = frame.readText()
-                        if(message == "ping") {
-                            return@withTimeoutOrNull true
-                        }
-                        val data = Json.decodeFromString<SongRequest>(message)
-                        if (data.type == SongType.ACK.value) {
-                            return@withTimeoutOrNull true // ACK 받음
-                        }
+        try {
+            for (frame in ws.incoming) {
+                if (frame is Text) {
+                    val message = frame.readText()
+                    if (message == "ping") {
+                        continue // Keep the loop running if a ping is received
+                    }
+                    val data = Json.decodeFromString<SongRequest>(message)
+                    if (data.type == SongType.ACK.value) {
+                        return true // ACK received
                     }
                 }
-                false // 채널이 닫힘
-            } catch (e: Exception) {
-                logger.warn("Error waiting for ACK: ${e.message}")
-                false
             }
-        } ?: false // 타임아웃 시 false 반환
+        } catch (e: Exception) {
+            logger.warn("Error waiting for ACK: ${e.message}")
+        }
+        return false // Return false if no ACK received
     }
 
 
@@ -114,7 +110,7 @@ fun Routing.wsSongListRoutes() {
                 null
             }
 
-            if(ws == null) continue
+            if (ws == null) continue
 
             try {
                 // 메시지 전송 시도
@@ -124,6 +120,7 @@ fun Routing.wsSongListRoutes() {
                 // ACK 대기
                 val ackReceived = waitForAck(ws, res.type)
                 if (ackReceived) {
+                    logger.debug("ACK received for message to $uid on attempt $attempt.")
                     sentSuccessfully = true
                 } else {
                     logger.warn("ACK not received for message to $uid on attempt $attempt.")
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 e4b7828..146501a 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
@@ -1,11 +1,13 @@
 package space.mori.chzzk_bot.webserver.routes
 
+import io.ktor.server.application.ApplicationStopped
 import io.ktor.server.routing.*
 import io.ktor.server.websocket.*
 import io.ktor.websocket.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.channels.ClosedReceiveChannelException
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -21,6 +23,10 @@ import java.util.concurrent.ConcurrentLinkedQueue
 val routeScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
 
 fun Routing.wsSongRoutes() {
+    environment.monitor.subscribe(ApplicationStopped) {
+        routeScope.cancel()
+    }
+
     val sessions = ConcurrentHashMap<String, ConcurrentLinkedQueue<WebSocketServerSession>>()
     val status = ConcurrentHashMap<String, SongType>()
     val logger = LoggerFactory.getLogger("WSSongRoutes")