Embodiments of the disclosure include a method and apparatus for detecting and removing cycle slip. A phase-modulated signal having a plurality of phase-modulated symbols is received at an optical receiver, and, for each phase-modulated symbol, a phase-error estimate of a phase error of the phase-modulated symbol is generated. The presence of a cycle slip is then detected based on the phase-error estimates, and, a phase of each of one or more of the received phase-modulated symbols is adjusted to remove the detected cycle slip without adjusting a local oscillator.