Fix bug on notification switch state causing FC