diff --git a/ItemData.cs b/ItemData.cs
index 44d5d98..0bfc3e0 100644
--- a/ItemData.cs
+++ b/ItemData.cs
@@ -80,6 +80,7 @@ public record DamageRange(double Min, double Max)
     public string ClassName { get; } = string.Empty;
     public string BaseName { get; } = string.Empty;
     public string Name { get; } = string.Empty;
+    public string UniqueName { get; } = string.Empty;
     public string PublicPrice { get; } = string.Empty;
     public string HeistContractJobType { get; } = string.Empty;
     public int ItemQuality { get; } = 0;
@@ -250,7 +251,8 @@ private ItemData(Entity itemEntity, Entity groundItem, GameController gc, LabelO
             var affixSlots = GetTotalAffixSlots();
             IsIdentified = modsComp.Identified;
             ItemLevel = modsComp.ItemLevel;
-            Name = string.IsNullOrWhiteSpace(modsComp.UniqueName) ? Name : modsComp.UniqueName;
+            UniqueName = modsComp.UniqueName ?? string.Empty;
+            Name = string.IsNullOrWhiteSpace(UniqueName) ? Name : UniqueName;
             IsSynthesised = modsComp.Synthesised;
             IsMirrored = modsComp.IsMirrored;
             Enchanted = modsComp.EnchantedMods?.Count > 0;