Fix issue with notification conditional