Attempt to improve "No Notifications" stuck bug.