diff --git a/Source/Contents/Items/ItemInfo.cpp b/Source/Contents/Items/ItemInfo.cpp
index c4b9535b6..544ef8279 100644
--- a/Source/Contents/Items/ItemInfo.cpp
+++ b/Source/Contents/Items/ItemInfo.cpp
@@ -210,13 +210,18 @@ ITEM_INFO LookupClientItem(const std::list<ITEM_INFO>& values, int id, unsigned
 // OFFSET: 0x00DDD5A0
 // FUNCTION: fn_23387
 ITEM_INFO LookupClientItemByIdentity(const std::list<ITEM_INFO>& values, std::uint32_t id) {
-  for (const ITEM_INFO& value : values) {
-    if (value.unknown_0000[1] == id) {
-      return value;
+  if (values.empty()) {
+    return ITEM_INFO(0);
+  }
+
+  auto it = values.begin();
+  for (; it != values.end(); ++it) {
+    if (it->unknown_0000[1] == id) {
+      break;
     }
   }
 
-  return ITEM_INFO(0);
+  return it != values.end() ? *it : ITEM_INFO(0);
 }
 
 // OFFSET: 0x006D5450