diff --git a/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java b/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java
index ff6a6c3..cf59db0 100644
--- a/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java
+++ b/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java
@@ -40,6 +40,11 @@ public class AvatarStorage extends BasePlayerManager implements Iterable<GameAva
     }
 
     public GameAvatar getAvatarById(int id) {
+        // Check if we are trying to retrieve the hero character
+        if (GameData.getHeroExcelMap().containsKey(id)) {
+            id = GameConstants.TRAILBLAZER_AVATAR_ID;
+        }
+        
         return getAvatars().get(id);
     }
     
diff --git a/src/main/java/emu/lunarcore/game/inventory/GameItem.java b/src/main/java/emu/lunarcore/game/inventory/GameItem.java
index 5e22ee9..7adef28 100644
--- a/src/main/java/emu/lunarcore/game/inventory/GameItem.java
+++ b/src/main/java/emu/lunarcore/game/inventory/GameItem.java
@@ -293,7 +293,7 @@ public class GameItem {
                 .setMainAffixId(this.mainAffix);
         
         if (this.getEquipAvatar() != null) {
-            proto.setEquipAvatarId(this.getEquipAvatar().getAvatarId());
+            proto.setEquipAvatarId(this.getEquipAvatar().getExcel().getId());
         }
 
         if (this.subAffixes != null) {
@@ -316,7 +316,7 @@ public class GameItem {
                 .setRank(this.getRank());
         
         if (this.getEquipAvatar() != null) {
-            proto.setEquipAvatarId(this.getEquipAvatar().getAvatarId());
+            proto.setEquipAvatarId(this.getEquipAvatar().getExcel().getId());
         }
         
         return proto;
diff --git a/src/main/java/emu/lunarcore/game/inventory/Inventory.java b/src/main/java/emu/lunarcore/game/inventory/Inventory.java
index c2cc20c..38728ef 100644
--- a/src/main/java/emu/lunarcore/game/inventory/Inventory.java
+++ b/src/main/java/emu/lunarcore/game/inventory/Inventory.java
@@ -564,7 +564,7 @@ public class Inventory extends BasePlayerManager {
     }
 
     public boolean unequipItem(int avatarId, int slot) {
-        GameAvatar avatar = getPlayer().getAvatars().getAvatarById(avatarId);
+        GameAvatar avatar = getPlayer().getAvatarById(avatarId);
 
         if (avatar != null) {
             GameItem unequipped = avatar.unequipItem(slot);
diff --git a/src/main/java/emu/lunarcore/game/player/Player.java b/src/main/java/emu/lunarcore/game/player/Player.java
index 49e35db..a8d08ee 100644
--- a/src/main/java/emu/lunarcore/game/player/Player.java
+++ b/src/main/java/emu/lunarcore/game/player/Player.java
@@ -328,11 +328,6 @@ public class Player implements Tickable {
     }
 
     public GameAvatar getAvatarById(int avatarId) {
-        // Check if we are trying to retrieve the hero character
-        if (GameData.getHeroExcelMap().containsKey(avatarId)) {
-            avatarId = GameConstants.TRAILBLAZER_AVATAR_ID;
-        }
-        
         return getAvatars().getAvatarById(avatarId);
     }