Attempt to fix some notifications being showned preemtively