diff --git a/src/main/java/org/websoso/WSSServer/repository/FeedCustomRepositoryImpl.java b/src/main/java/org/websoso/WSSServer/repository/FeedCustomRepositoryImpl.java
index 797d9254..a598a953 100644
--- a/src/main/java/org/websoso/WSSServer/repository/FeedCustomRepositoryImpl.java
+++ b/src/main/java/org/websoso/WSSServer/repository/FeedCustomRepositoryImpl.java
@@ -174,7 +174,10 @@ private BooleanExpression checkPopularFeed() {
     }
 
     private BooleanExpression checkGenres(List<Genre> genres) {
-        return genre.in(genres).or(feed.novelId.isNull());
+        if (genres != null && !genres.isEmpty()) {
+            return genre.in(genres).or(feed.novelId.isNull());
+        }
+        return null;
     }
 
     private BooleanExpression checkBlocking(Long userId) {