diff --git a/src/httpd_daap.c b/src/httpd_daap.c
index 60c8dc61..5f2b0dc9 100644
--- a/src/httpd_daap.c
+++ b/src/httpd_daap.c
@@ -638,7 +638,10 @@ get_query_params(struct evkeyvalq *query, int *sort_headers, struct query_params
   else
     qp->limit = (high - low) + 1;
 
-  qp->idx_type = I_SUB;
+  if (qp->limit == -1 && qp->offset == 0)
+    qp->idx_type = I_NONE;
+  else
+    qp->idx_type = I_SUB;
 
   qp->sort = S_NONE;
   param = evhttp_find_header(query, "sort");