diff --git a/src/applications/feed/conduit/FeedQueryConduitAPIMethod.php b/src/applications/feed/conduit/FeedQueryConduitAPIMethod.php
--- a/src/applications/feed/conduit/FeedQueryConduitAPIMethod.php
+++ b/src/applications/feed/conduit/FeedQueryConduitAPIMethod.php
@@ -63,13 +63,7 @@
       $view_type = 'data';
     }
 
-    $limit = $request->getValue('limit');
-    if (!$limit) {
-      $limit = $this->getDefaultLimit();
-    }
-
     $query = id(new PhabricatorFeedQuery())
-      ->setLimit($limit)
       ->setViewer($user);
 
     $filter_phids = $request->getValue('filterPHIDs');
@@ -77,17 +71,25 @@
       $query->withFilterPHIDs($filter_phids);
     }
 
+    $limit = $request->getValue('limit');
+    if (!$limit) {
+      $limit = $this->getDefaultLimit();
+    }
+
+    $pager = id(new AphrontCursorPagerView())
+      ->setPageSize($limit);
+
     $after = $request->getValue('after');
     if (strlen($after)) {
-      $query->setAfterID($after);
+      $pager->setAfterID($after);
     }
 
     $before = $request->getValue('before');
     if (strlen($before)) {
-      $query->setBeforeID($before);
+      $pager->setBeforeID($before);
     }
 
-    $stories = $query->execute();
+    $stories = $query->executeWithCursorPager($pager);
 
     if ($stories) {
       foreach ($stories as $story) {