This paper describes practical issues related to control of the active power buffer (APB) developed for a 2 kVA single-phase inverter. The buffer is designed using the latest GaN HEMTs controlled with triangular current mode to reduce switching losses, however, the switching frequency should be limited to 1 MHz. In the case of the presented analogue-digital controller, frequency is influenced by a reference current of the APB and circuit. Therefore, the operation at start-up and shut-down is especially challenging. A modified control algorithm that also includes pre-charging and discharging process of the energy buffer is presented and experimentally verified by series of tests of the 2 kVA GaN based inverter with the APB.