This could also change if we move this listener into `updateConfigAndWait`