LPS-40527 XSS

Just want to make sure I don't break anything.