diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.java
index 8b0ec84a0..6db42c518 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.java
@@ -108,6 +108,9 @@ public class PushNotificationManager {
     }
 
     private Boolean userHasPushDevice() {
+        if (this.user.getPushDevices() == null) {
+            return true;
+        }
         for(PushDevice pushDevice : this.user.getPushDevices()) {
             if(pushDevice.getRegId().equals(this.refreshedToken)) {
                 return true;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
index 1092cfd45..d0595b59b 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
@@ -99,7 +99,7 @@ public class HabitRPGUser extends BaseModel {
             foreignColumnName = "user_id")})
     private Invitations invitations;
 
-    private List<PushDevice> pushDevices = new ArrayList<PushDevice>();
+    private List<PushDevice> pushDevices;
 
     private Purchases purchased;