diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt
index 732efcd..35c12cf 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt
@@ -394,7 +394,7 @@ class LiveRoomQueryRepositoryImpl(
                     member.nickname,
                     member.profileImage.prepend("/").prepend(cloudFrontHost),
                     liveRoom.title,
-                    liveRoom.updatedAt.max()
+                    liveRoom.updatedAt
                 )
             )
             .from(liveRoom)
@@ -404,12 +404,14 @@ class LiveRoomQueryRepositoryImpl(
                     .eq(
                         JPAExpressions.select(subLiveRoom.updatedAt.max())
                             .from(subLiveRoom)
-                            .where(subLiveRoom.member.eq(liveRoom.member))
+                            .where(
+                                subLiveRoom.member.eq(liveRoom.member)
+                                    .and(subLiveRoom.isActive.isFalse)
+                                    .and(subLiveRoom.channelName.isNotNull)
+                            )
                     )
-                    .and(liveRoom.isActive.isFalse)
-                    .and(liveRoom.channelName.isNotNull)
             )
-            .orderBy(liveRoom.updatedAt.max().desc())
+            .orderBy(liveRoom.updatedAt.desc())
             .offset(offset)
             .limit(20)
             .fetch()