diff --git a/pkg/services/tree/service.go b/pkg/services/tree/service.go
index 98c5626bd..eeffec08b 100644
--- a/pkg/services/tree/service.go
+++ b/pkg/services/tree/service.go
@@ -463,14 +463,13 @@ func getSortedSubTree(ctx context.Context, srv TreeService_GetSubTreeServer, cid
 				break
 			}
 
-			nodes, last, err := forest.TreeSortedByFilename(ctx, cid, b.GetTreeId(), item.parent, item.last, batchSize)
+			var err error
+			item.values, item.last, err = forest.TreeSortedByFilename(ctx, cid, b.GetTreeId(), item.parent, item.last, batchSize)
 			if err != nil {
 				return err
 			}
-			item.values = nodes
-			item.last = last
 
-			if len(nodes) == 0 {
+			if len(item.values) == 0 {
 				stack = stack[:len(stack)-1]
 				continue
 			}