diff --git a/src/main/java/org/websoso/WSSServer/feed/repository/FeedCustomRepositoryImpl.java b/src/main/java/org/websoso/WSSServer/feed/repository/FeedCustomRepositoryImpl.java
index 764b7666..05392a47 100644
--- a/src/main/java/org/websoso/WSSServer/feed/repository/FeedCustomRepositoryImpl.java
+++ b/src/main/java/org/websoso/WSSServer/feed/repository/FeedCustomRepositoryImpl.java
@@ -45,7 +45,11 @@ public List<Feed> findPopularFeedsByNovelIds(List<Long> novelIds) {
                 .map(novelId -> jpaQueryFactory
                         .selectFrom(feed)
                         .leftJoin(feed.likes, like)
-                        .where(feed.novelId.eq(novelId))
+                        .where(
+                                feed.novelId.eq(novelId),
+                                feed.isPublic.isTrue(),
+                                feed.isSpoiler.isFalse()
+                        )
                         .groupBy(feed.feedId)
                         .orderBy(like.count().desc())
                         .fetchFirst())