diff --git a/dashboard-ui/scripts/channelitems.js b/dashboard-ui/scripts/channelitems.js
index 880e388e9b..7da5f8ef54 100644
--- a/dashboard-ui/scripts/channelitems.js
+++ b/dashboard-ui/scripts/channelitems.js
@@ -1,7 +1,7 @@
 (function ($, document) {
 
     var maxPageSize;
-    
+
     // The base query options
     var query = {
 
@@ -9,7 +9,7 @@
         SortOrder: "Ascending",
         StartIndex: 0
     };
-    
+
     function getPageSizes() {
 
         var sizes = [];
@@ -20,7 +20,7 @@
         if (!maxPageSize || maxPageSize >= 40) sizes.push(40);
         if (!maxPageSize || maxPageSize >= 50) sizes.push(50);
         if (!maxPageSize || maxPageSize >= 100) sizes.push(100);
-        
+
         return sizes;
     }
 
@@ -60,8 +60,12 @@
 
             maxPageSize = features.MaxPageSize;
 
+            if (maxPageSize) {
+                query.Limit = Math.min(maxPageSize, query.Limit || maxPageSize);
+            }
+
             updateSortOrders(page, features.DefaultSortFields);
-            
+
             reloadItems(page);
         });
     }
@@ -77,7 +81,7 @@
     }
 
     function updateSortOrder(page, fields, name) {
-        
+
         var cssClass = "sortby" + name;
 
         if (fields.indexOf(name) == -1) {
@@ -115,7 +119,7 @@
         }
 
         query.folderId = folderId;
-        
+
         $.getJSON(ApiClient.getUrl("Channels/" + channelId + "/Items", query)).done(function (result) {
 
             // Scroll back up so they can see the results from the beginning