diff --git a/Libraries/Core/Helpers/InventoryHelper.cs b/Libraries/Core/Helpers/InventoryHelper.cs
index 7aa95f9a..6cda24c1 100644
--- a/Libraries/Core/Helpers/InventoryHelper.cs
+++ b/Libraries/Core/Helpers/InventoryHelper.cs
@@ -770,8 +770,16 @@ public class InventoryHelper(
         // Check each item in container
         foreach (var item in containerItemHash)
         {
-            var location = (JsonElement)item.Location;
-            var itemLocation = location.ToObject<ItemLocation>();
+            ItemLocation? itemLocation;
+            if (item.Location is JsonElement)
+            {
+                itemLocation = ((JsonElement)item.Location).ToObject<ItemLocation>();
+            }
+            else
+            {
+                itemLocation = (ItemLocation)item.Location;
+            }
+            
             if (itemLocation is null)
             {
                 // item has no location property