src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt

@@ -173,11 +173,18 @@ class ContentSeriesQueryRepositoryImpl(
             }
         }
 
+        val orderBy = if (creatorId != null) {
+            listOf(series.orders.asc(), series.createdAt.asc())
+        } else {
+            listOf(seriesContent.createdAt.desc())
+        }
+
         return queryFactory
             .selectFrom(series)
             .innerJoin(series.member, member)
+            .innerJoin(seriesContent).on(series.id.eq(seriesContent.series.id))
             .where(where)
-            .orderBy(series.orders.asc(), series.createdAt.asc())
+            .orderBy(*orderBy.toTypedArray())
             .offset(offset)
             .limit(limit)
             .fetch()