Base: Fix initial controller update occurring twice