diff --git a/pkg/storage/utils/eosfs/eosfs.go b/pkg/storage/utils/eosfs/eosfs.go
index d21f8dbd09..fc5e001d13 100644
--- a/pkg/storage/utils/eosfs/eosfs.go
+++ b/pkg/storage/utils/eosfs/eosfs.go
@@ -1282,8 +1282,6 @@ func (fs *eosfs) ListFolder(ctx context.Context, ref *provider.Reference, mdKeys
 		return nil, errors.Wrap(err, "eosfs: error resolving reference")
 	}
 
-	p = fs.wrap(ctx, p)
-
 	u, err := getUser(ctx)
 	if err != nil {
 		return nil, errors.Wrap(err, "eosfs: no user in ctx")
@@ -1299,6 +1297,8 @@ func (fs *eosfs) ListFolder(ctx context.Context, ref *provider.Reference, mdKeys
 
 	for i, key := range mdKeys {
 		if key == "search" {
+			p = fs.wrap(ctx, p)
+
 			// TODO(salfagem): Ugly hack due to mdKeys being an array.
 			// 	- also check that searchString not empty:
 			searchString = mdKeys[i+1]