diff --git a/changelog/unreleased/fix-propfind-root-id.md b/changelog/unreleased/fix-propfind-root-id.md
new file mode 100644
index 0000000000..92607f539a
--- /dev/null
+++ b/changelog/unreleased/fix-propfind-root-id.md
@@ -0,0 +1,5 @@
+Bugfix: Fix propfind root id
+
+decomposedfs now returns the storageprovider id in the root info when listing spaces
+
+https://github.com/cs3org/reva/pull/4000
diff --git a/internal/grpc/services/storageprovider/storageprovider.go b/internal/grpc/services/storageprovider/storageprovider.go
index 872105788e..6a48b1bd40 100644
--- a/internal/grpc/services/storageprovider/storageprovider.go
+++ b/internal/grpc/services/storageprovider/storageprovider.go
@@ -545,6 +545,7 @@ func (s *Service) CreateStorageSpace(ctx context.Context, req *provider.CreateSt
 	}
 
 	s.addMissingStorageProviderID(resp.GetStorageSpace().GetRoot(), resp.GetStorageSpace().GetId())
+	s.addMissingStorageProviderID(resp.GetStorageSpace().GetRootInfo().GetId(), nil)
 	return resp, nil
 }
 
@@ -589,6 +590,7 @@ func (s *Service) ListStorageSpaces(ctx context.Context, req *provider.ListStora
 		}
 
 		s.addMissingStorageProviderID(sp.GetRoot(), sp.GetId())
+		s.addMissingStorageProviderID(sp.GetRootInfo().GetId(), nil)
 	}
 
 	return &provider.ListStorageSpacesResponse{
@@ -608,6 +610,7 @@ func (s *Service) UpdateStorageSpace(ctx context.Context, req *provider.UpdateSt
 		return nil, err
 	}
 	s.addMissingStorageProviderID(res.GetStorageSpace().GetRoot(), res.GetStorageSpace().GetId())
+	s.addMissingStorageProviderID(res.GetStorageSpace().GetRootInfo().GetId(), nil)
 	return res, nil
 }