Fixed #25049 - Fixes issues when using user sandboxes