diff --git a/src/main/kotlin/com/android/trisolarisserver/repo/RoomImageRepo.kt b/src/main/kotlin/com/android/trisolarisserver/repo/RoomImageRepo.kt
index 0209ef1..dadb913 100644
--- a/src/main/kotlin/com/android/trisolarisserver/repo/RoomImageRepo.kt
+++ b/src/main/kotlin/com/android/trisolarisserver/repo/RoomImageRepo.kt
@@ -12,7 +12,7 @@ interface RoomImageRepo : JpaRepository<RoomImage, UUID> {
         select ri
         from RoomImage ri
         where ri.room.id = :roomId
-        order by (ri.roomSortOrder is null), ri.roomSortOrder asc, ri.createdAt desc
+        order by case when ri.roomSortOrder is null then 1 else 0 end, ri.roomSortOrder asc, ri.createdAt desc
         """
     )
     fun findByRoomIdOrdered(@Param("roomId") roomId: UUID): List<RoomImage>