diff --git a/modules/store/src/main/scala/docspell/store/queries/QItem.scala b/modules/store/src/main/scala/docspell/store/queries/QItem.scala
index 174c25b1..12ef6dd1 100644
--- a/modules/store/src/main/scala/docspell/store/queries/QItem.scala
+++ b/modules/store/src/main/scala/docspell/store/queries/QItem.scala
@@ -329,10 +329,12 @@ object QItem {
           coalesce(IC.itemDate.prefix("i").f, IC.created.prefix("i").f) ++ fr"DESC"
         )
     }
+    val limitOffset =
+      if (batch == Batch.all) Fragment.empty
+      else fr"LIMIT ${batch.limit} OFFSET ${batch.offset}"
+
     val frag =
-      query ++ fr"WHERE" ++ cond ++ order ++ (if (batch == Batch.all) Fragment.empty
-                                              else
-                                                fr"LIMIT ${batch.limit} OFFSET ${batch.offset}")
+      query ++ fr"WHERE" ++ cond ++ order ++ limitOffset
     logger.trace(s"List $batch items: $frag")
     frag.query[ListItem].stream
   }