diff --git a/pkg/local_object_storage/pilorama/forest.go b/pkg/local_object_storage/pilorama/forest.go
index 92183716c..ef284a727 100644
--- a/pkg/local_object_storage/pilorama/forest.go
+++ b/pkg/local_object_storage/pilorama/forest.go
@@ -205,10 +205,7 @@ func (f *memoryForest) TreeSortedByFilename(_ context.Context, cid cid.ID, treeI
 	r := mergeNodeInfos(res)
 	for i := range r {
 		if start == nil || string(findAttr(r[i].Meta, AttributeFilename)) > *start {
-			finish := i + count
-			if len(res) < finish {
-				finish = len(res)
-			}
+			finish := min(len(res), i+count)
 			last := string(findAttr(r[finish-1].Meta, AttributeFilename))
 			return r[i:finish], &last, nil
 		}
diff --git a/pkg/morph/client/client.go b/pkg/morph/client/client.go
index 19349ccd5..e63d926e0 100644
--- a/pkg/morph/client/client.go
+++ b/pkg/morph/client/client.go
@@ -262,10 +262,7 @@ func (c *Client) TestInvokeIterator(cb func(stackitem.Item) error, batchSize int
 	}()
 
 	// Batch size for TraverseIterator() can restricted on the server-side.
-	traverseBatchSize := batchSize
-	if invoker.DefaultIteratorResultItems < traverseBatchSize {
-		traverseBatchSize = invoker.DefaultIteratorResultItems
-	}
+	traverseBatchSize := min(batchSize, invoker.DefaultIteratorResultItems)
 	for {
 		items, err := c.rpcActor.TraverseIterator(sid, &r, traverseBatchSize)
 		if err != nil {