Fixed an issue where notifications were appearing too frequently