Fix push notifications

User story: Push notifications are not working very well on mobile.

Complexity: ?

Outcomes (or what needs to be done to move forward): more testing