diff --git a/Libraries/SPTarkov.Server.Core/Extensions/ItemExtensions.cs b/Libraries/SPTarkov.Server.Core/Extensions/ItemExtensions.cs
index 3f0ee18c..b262629c 100644
--- a/Libraries/SPTarkov.Server.Core/Extensions/ItemExtensions.cs
+++ b/Libraries/SPTarkov.Server.Core/Extensions/ItemExtensions.cs
@@ -289,33 +289,41 @@ namespace SPTarkov.Server.Core.Extensions
             // Use dictionary to make key lookup faster, convert to list before being returned
             var itemList = items.ToList();
             OrderedDictionary<MongoId, Item> result = [];
-            foreach (var childItem in itemList)
+
+            // Find desired root item
+            var desiredRootItem = itemList.FirstOrDefault(item => item.Id == baseItemId);
+            if (desiredRootItem is null)
             {
-                // Include itself
-                if (childItem.Id == baseItemId)
+                // Root not found, nothing to return, exit
+                return [];
+            }
+            result.Add(desiredRootItem.Id, desiredRootItem);
+            var rootItemIdString = desiredRootItem.Id.ToString();
+
+            foreach (var item in itemList)
+            {
+                if (result.ContainsKey(item.Id))
+                {
+                    // Already processed, skip
+                    continue;
+                }
+
+                // Skip items with different parentId
+                if (item.ParentId != rootItemIdString)
                 {
-                    // Root item MUST be at 0 index for things like flea market offers
-                    result.Insert(0, childItem.Id, childItem);
                     continue;
                 }
 
                 // Is stored in parent and disallowed
-                if (modsOnly && childItem.Location is not null)
+                if (modsOnly && item.Location is not null)
                 {
                     continue;
                 }
 
-                // Items parentId matches root item AND returned items doesn't contain current child
-                if (
-                    !result.ContainsKey(childItem.Id)
-                    && childItem.ParentId != "hideout"
-                    && childItem.ParentId == baseItemId.ToString()
-                )
+                // Item may have children, check
+                foreach (var subItem in FindAndReturnChildrenAsItems(itemList, item.Id))
                 {
-                    foreach (var item in FindAndReturnChildrenAsItems(items, childItem.Id))
-                    {
-                        result.Add(item.Id, item);
-                    }
+                    result.Add(subItem.Id, subItem);
                 }
             }