diff --git a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiDiscordRoutes.kt b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiDiscordRoutes.kt
index 7f91c3c..690be95 100644
--- a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiDiscordRoutes.kt
+++ b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/routes/ApiDiscordRoutes.kt
@@ -32,8 +32,12 @@ fun Route.apiDiscordRoutes() {
                 call.respond(HttpStatusCode.NotFound)
                 return@get
             }
-
-            call.respond(HttpStatusCode.OK, DiscordGuildCache.getCachedGuilds(user.discord.toString())!!)
+            val guild = DiscordGuildCache.getCachedGuilds(user.liveAlertGuild.toString())
+            if(guild == null) {
+                call.respond(HttpStatusCode.NotFound)
+                return@get
+            }
+            call.respond(HttpStatusCode.OK, guild)
             return@get
         }
         get {