Fix usage of temporary entity data in Workspaces

Opened a MR to fix this. It doesn't need any new test coverage, this behavior is already tested in a lot of places.

Seems like a good refactor to me.

catch → closed merge request !10842

Committed/pushed to 11.x, thanks!

I don't think we need to backport this anywhere, but re-open if I've missed something.

Automatically closed - issue fixed for 2 weeks with no activity.