diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
index 25ab32f..1a3feaa 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
@@ -39,7 +39,7 @@ import kr.co.vividnext.sodalive.live.room.info.LiveRoomInfoRedisRepository
 import kr.co.vividnext.sodalive.live.room.info.LiveRoomMember
 import kr.co.vividnext.sodalive.live.room.kickout.LiveRoomKickOutService
 import kr.co.vividnext.sodalive.live.room.visit.LiveRoomVisitService
-import kr.co.vividnext.sodalive.live.roulette.RouletteRepository
+import kr.co.vividnext.sodalive.live.roulette.NewRouletteRepository
 import kr.co.vividnext.sodalive.live.tag.LiveTagRepository
 import kr.co.vividnext.sodalive.member.Gender
 import kr.co.vividnext.sodalive.member.Member
@@ -66,7 +66,7 @@ import kotlin.concurrent.write
 @Transactional(readOnly = true)
 class LiveRoomService(
     private val repository: LiveRoomRepository,
-    private val rouletteRepository: RouletteRepository,
+    private val rouletteRepository: NewRouletteRepository,
     private val roomInfoRepository: LiveRoomInfoRedisRepository,
     private val roomCancelRepository: LiveRoomCancelRepository,
     private val kickOutService: LiveRoomKickOutService,
@@ -1004,10 +1004,12 @@ class LiveRoomService(
                     kickOutService.deleteKickOutData(roomId = room.id!!)
                     roomInfoRepository.deleteById(roomInfo.roomId)
 
-                    val roulette = rouletteRepository.findByIdOrNull(member.id!!)
-                    if (roulette != null) {
-                        roulette.isActive = false
-                        rouletteRepository.save(roulette)
+                    val rouletteList = rouletteRepository.findByCreatorId(creatorId = member.id!!)
+                    if (rouletteList.isNotEmpty()) {
+                        rouletteList.forEach {
+                            it.isActive = false
+                            rouletteRepository.save(it)
+                        }
                     }
                 } else {
                     roomInfo.removeSpeaker(member)