diff --git a/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java b/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java
index 146c273d2..1023860d7 100644
--- a/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java
+++ b/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java
@@ -52,7 +52,7 @@ public class CommentServiceImpl implements CommentService {
                 commentQuery.getPage(), commentQuery.getSize())
             .flatMap(comments -> Flux.fromStream(comments.get()
                     .map(this::toListedComment))
-                .flatMap(Function.identity())
+                .concatMap(Function.identity())
                 .collectList()
                 .map(list -> new ListResult<>(comments.getPage(), comments.getSize(),
                     comments.getTotal(), list)
diff --git a/src/main/java/run/halo/app/content/comment/ReplyServiceImpl.java b/src/main/java/run/halo/app/content/comment/ReplyServiceImpl.java
index 30d73e66e..dedd85ae0 100644
--- a/src/main/java/run/halo/app/content/comment/ReplyServiceImpl.java
+++ b/src/main/java/run/halo/app/content/comment/ReplyServiceImpl.java
@@ -99,7 +99,7 @@ public class ReplyServiceImpl implements ReplyService {
                 query.getPage(), query.getSize())
             .flatMap(list -> Flux.fromStream(list.get()
                     .map(this::toListedReply))
-                .flatMap(Function.identity())
+                .concatMap(Function.identity())
                 .collectList()
                 .map(listedReplies -> new ListResult<>(list.getPage(), list.getSize(),
                     list.getTotal(), listedReplies))
diff --git a/src/main/java/run/halo/app/content/impl/PostServiceImpl.java b/src/main/java/run/halo/app/content/impl/PostServiceImpl.java
index f1d4e6fea..16b07db47 100644
--- a/src/main/java/run/halo/app/content/impl/PostServiceImpl.java
+++ b/src/main/java/run/halo/app/content/impl/PostServiceImpl.java
@@ -69,7 +69,7 @@ public class PostServiceImpl implements PostService {
             .flatMap(listResult -> Flux.fromStream(
                         listResult.get().map(this::getListedPost)
                     )
-                    .flatMap(Function.identity())
+                    .concatMap(Function.identity())
                     .collectList()
                     .map(listedPosts -> new ListResult<>(listResult.getPage(), listResult.getSize(),
                         listResult.getTotal(), listedPosts)
diff --git a/src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java b/src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java
index fe319af9f..199a61cff 100644
--- a/src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java
+++ b/src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java
@@ -70,7 +70,7 @@ public class SinglePageServiceImpl implements SinglePageService {
             .flatMap(listResult -> Flux.fromStream(
                         listResult.get().map(this::getListedSinglePage)
                     )
-                    .flatMap(Function.identity())
+                    .concatMap(Function.identity())
                     .collectList()
                     .map(listedSinglePages -> new ListResult<>(listResult.getPage(),
                         listResult.getSize(),
diff --git a/src/main/java/run/halo/app/theme/finders/impl/CommentFinderImpl.java b/src/main/java/run/halo/app/theme/finders/impl/CommentFinderImpl.java
index f891e03fe..6a3e5af22 100644
--- a/src/main/java/run/halo/app/theme/finders/impl/CommentFinderImpl.java
+++ b/src/main/java/run/halo/app/theme/finders/impl/CommentFinderImpl.java
@@ -49,7 +49,7 @@ public class CommentFinderImpl implements CommentFinder {
                 defaultComparator(),
                 pageNullSafe(page), sizeNullSafe(size))
             .flatMap(list -> Flux.fromStream(list.get().map(this::toCommentVo))
-                .flatMap(Function.identity())
+                .concatMap(Function.identity())
                 .collectList()
                 .map(commentVos -> new ListResult<>(list.getPage(), list.getSize(), list.getTotal(),
                     commentVos)
@@ -68,7 +68,7 @@ public class CommentFinderImpl implements CommentFinder {
                     && Objects.equals(true, reply.getSpec().getApproved()),
                 comparator.reversed(), pageNullSafe(page), sizeNullSafe(size))
             .flatMap(list -> Flux.fromStream(list.get().map(this::toReplyVo))
-                .flatMap(Function.identity())
+                .concatMap(Function.identity())
                 .collectList()
                 .map(replyVos -> new ListResult<>(list.getPage(), list.getSize(), list.getTotal(),
                     replyVos))