Fixes #8124 - Entrypoint sent to API