A method of rotating polarization of light travelling in a waveguide includes receiving an optical signal having a first polarization state at a first section of the waveguide, the first section of the waveguide being disposed on a plane of a substrate, using a micro-electromechanical system (MEMS) device, angling a second section of the waveguide out of the plane of the substrate, and outputting the optical signal with a second polarization state, different from the first polarization state, on a third section of the waveguide, the third section of the waveguide also being disposed on the plane of the substrate. A control loop is provided to sense the polarization shift to control the angle of the MEMS device to compensate for that shift.