Fix for #24166 - fixes issue when rendering in proxy mode