diff --git a/internal/http/services/owncloud/ocgraph/drives.go b/internal/http/services/owncloud/ocgraph/drives.go
index a713d3473e1..f15dee73c6b 100644
--- a/internal/http/services/owncloud/ocgraph/drives.go
+++ b/internal/http/services/owncloud/ocgraph/drives.go
@@ -112,13 +112,14 @@ func generateCs3Filters(request *godata.GoDataRequest) ([]*providerpb.ListStorag
 }
 
 func (s *svc) cs3StorageSpaceToDrive(user *userpb.User, space *providerpb.StorageSpace) *libregraph.Drive {
+	id := url.PathEscape(space.RootInfo.Path)
 	drive := &libregraph.Drive{
 		DriveAlias: libregraph.PtrString(space.RootInfo.Path[1:]),
-		Id:         libregraph.PtrString(space.Id.OpaqueId),
+		Id:         &id,
 		Name:       space.Name,
 		DriveType:  libregraph.PtrString(space.SpaceType),
 		Root: &libregraph.DriveItem{
-			Id:          libregraph.PtrString(space.Id.OpaqueId),
+			Id:          &id,
 			Permissions: cs3PermissionsToLibreGraph(user, space.RootInfo.PermissionSet),
 		},
 	}