diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/itemhandling/ItemRowAdapter.java b/app/src/main/java/org/jellyfin/androidtv/ui/itemhandling/ItemRowAdapter.java
index 009d82e01c..e62efbb337 100644
--- a/app/src/main/java/org/jellyfin/androidtv/ui/itemhandling/ItemRowAdapter.java
+++ b/app/src/main/java/org/jellyfin/androidtv/ui/itemhandling/ItemRowAdapter.java
@@ -485,7 +485,7 @@ public void loadMoreItemsIfNeeded(int pos) {
     }
 
     private void retrieveNext() {
-        if (fullyLoaded || isCurrentlyRetrieving()) {
+        if (fullyLoaded || isCurrentlyRetrieving() || chunkSize == 0) {
             return;
         }
 
@@ -566,7 +566,11 @@ public void Retrieve() {
         itemsLoaded = 0;
         switch (queryType) {
             case Items:
-                ItemRowAdapterHelperKt.retrieveItems(this, api.getValue(), mQuery, 0, chunkSize);
+                if (mQuery.getStartIndex() != null && mQuery.getLimit() != null) {
+                    ItemRowAdapterHelperKt.retrieveItems(this, api.getValue(), mQuery, mQuery.getStartIndex(), mQuery.getLimit());
+                } else {
+                    ItemRowAdapterHelperKt.retrieveItems(this, api.getValue(), mQuery, 0, chunkSize);
+                }
                 break;
             case NextUp:
                 ItemRowAdapterHelperKt.retrieveNextUpItems(this, api.getValue(), mNextUpQuery);