diff --git a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/skills/archery/ArcheryAbilities.java b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/skills/archery/ArcheryAbilities.java
index c04e60c1f..dac3b8a26 100644
--- a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/skills/archery/ArcheryAbilities.java
+++ b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/skills/archery/ArcheryAbilities.java
@@ -122,7 +122,7 @@ public void stun(Player player, User user, LivingEntity entity) {
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @SuppressWarnings("removal")
     private @NotNull AttributeModifier getAttributeModifier(AttributeInstance speed, double STUN_SPEED_REDUCTION) {
         double reducedSpeed = speed.getValue() * STUN_SPEED_REDUCTION;
         double attributeValue = -1 * reducedSpeed;
diff --git a/common/src/main/java/dev/aurelium/auraskills/common/storage/sql/SqlStorageProvider.java b/common/src/main/java/dev/aurelium/auraskills/common/storage/sql/SqlStorageProvider.java
index 2f0ed02d3..6d65efd68 100644
--- a/common/src/main/java/dev/aurelium/auraskills/common/storage/sql/SqlStorageProvider.java
+++ b/common/src/main/java/dev/aurelium/auraskills/common/storage/sql/SqlStorageProvider.java
@@ -559,8 +559,8 @@ public List<UserState> loadStates(boolean ignoreOnline, boolean skipKeyValues) t
                             traitModifiers = Collections.emptyMap();
                         }
 
-                        Map<Skill, Integer> skillLevelMap = loadedSkillLevels.get(userId);
-                        Map<Skill, Double> skillXpMap = loadedSkillXp.get(userId);
+                        Map<Skill, Integer> skillLevelMap = loadedSkillLevels.getOrDefault(userId, new HashMap<>());
+                        Map<Skill, Double> skillXpMap = loadedSkillXp.getOrDefault(userId, new HashMap<>());
 
                         UserState state = new UserState(uuid, skillLevelMap, skillXpMap, statModifiers, traitModifiers, mana);
                         states.add(state);