Fixed #17005 -- Added site middleware