A valve assembly for a water circulation system includes a bypass valve with an inlet and an outlet that permits recirculating flow of water from a hot water line of the water circulation system. The valve assembly also includes a shut-off valve with a valve body having a hot water inlet and a hot water outlet configured to be coupled to a fixture of the water circulation system. The shut-off valve is located proximate the fixture and operating in an open position allowing water to flow to the hot water outlet and a closed position restricting water from flowing to the hot water outlet. The shut-off valve is configured to move automatically from the open position to the closed position in a controlled manner to limit discharge, from the hot water outlet, of water having a temperature below a desired level.