A method of enabling and disabling diode emulation for a DC/DC converter which generates an output voltage including detecting a diode emulation request signal indicative of enabling or disabling diode emulation and delaying enabling or disabling diode emulation until after the output voltage begins changing. Diode emulation is enabled while the output voltage is decreasing or has reached a predetermined level and an optional delay may be included. Diode emulation is disabled while the voltage is increasing. A diode emulation control circuit includes a first circuit that determines when the output voltage is changing and a second circuit that selectively enables or disables diode emulation in response to a diode emulation enable/disable signal after the output voltage begins to change.