The water supply situation in the Klang Valley and Selangor has almost returned to normal with only about 8,500 consumers still facing water disruption as at 9am today.