diff --git a/pkg/storage/utils/decomposedfs/node/node.go b/pkg/storage/utils/decomposedfs/node/node.go
index 3dfa3152bd8..6bf41089b29 100644
--- a/pkg/storage/utils/decomposedfs/node/node.go
+++ b/pkg/storage/utils/decomposedfs/node/node.go
@@ -543,8 +543,7 @@ func (n *Node) AsResourceInfo(ctx context.Context, rp *provider.ResourcePermissi
 		// nodeType = provider.ResourceType_RESOURCE_TYPE_REFERENCE
 	}
 
-	// TODO ensure we always have a space root
-	id := &provider.ResourceId{StorageId: n.SpaceRoot.Name, OpaqueId: n.ID}
+	id := &provider.ResourceId{StorageId: n.SpaceID, OpaqueId: n.ID}
 
 	if returnBasename {
 		fn = n.Name