This was missing part of the unit ID meaning it would 404. Resolves #24674 (cherry picked from commit f30e4984)