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 cccff4c5a..211d0ee4a 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
@@ -312,8 +312,10 @@ public class HabitRPGUser extends BaseModel {
             t.user_id = id;
         }
 
-        for (Tag t : tags) {
-            t.user_id = id;
+        if (tags != null) {
+            for (Tag t : tags) {
+                t.user_id = id;
+            }
         }
 
         super.save();