diff --git a/src/main/java/me/kavin/piped/utils/ResponseHelper.java b/src/main/java/me/kavin/piped/utils/ResponseHelper.java
index d897f1b..7f2ea10 100644
--- a/src/main/java/me/kavin/piped/utils/ResponseHelper.java
+++ b/src/main/java/me/kavin/piped/utils/ResponseHelper.java
@@ -837,8 +837,6 @@ public class ResponseHelper {
                             video.getUploaded(), channel.isVerified()));
                 }
 
-                feedItems.sort(Comparator.<StreamItem>comparingLong(o -> o.uploaded).reversed());
-
                 return Constants.mapper.writeValueAsBytes(feedItems);
             }
         }
@@ -877,7 +875,7 @@ public class ResponseHelper {
                         ))
                         .orderBy(cb.desc(root.get("uploaded")));
 
-                List<Video> videos = s.createQuery(criteria).list();
+                List<Video> videos = s.createQuery(criteria).setMaxResults(100).list();
 
                 final List<SyndEntry> entries = new ObjectArrayList<>();