A network element includes an electronic switch for routing traffic between a plurality of client access ports and a plurality of EO ports, a respective EO interface coupled to each one of the plurality of EO ports; a wavelength selective switch for optically switching optical signals between the EO interfaces and a set of optical transmission fibers; and a control system. The plurality of EO interfaces includes at least one Make Before Break (MBB) EO interface. The control system is operative to reconfigure the network element by identifying an EO interface to be reconfigured. A new optical path is set up through the wavelength selective switch and terminated on the MBB EO interface. The electronic switch is then controlled to re-route a traffic flow traversing the identified EO interface to the MBB EO interface.