Update ShutdownEventListener to not stop event handling