The City of Johannesburg has settled the entirety of its overdue electricity debt to Eskom, closing out a R5.25 billion arrears dispute that had put the city's power supply at risk.