Videos on social media show Jenner surprising students as she joins the prom in Sacramento, California, with her TV film crew.

The Keeping Up With The Kardashians star posted a snap of herself in a glamorous prom dress.

Videos on social media show Jenner and Ochoa hugging before she leaves the event.

Ochoa's sister Selena wrote on Twitter: "Proud to say that's my brother."