Try to avoid error with push notifications