diff --git a/src/main/java/com/ffii/fpsms/modules/common/internalSetup/inventorySetup.kt b/src/main/java/com/ffii/fpsms/modules/common/internalSetup/inventorySetup.kt
index 3e90cc4..149d622 100644
--- a/src/main/java/com/ffii/fpsms/modules/common/internalSetup/inventorySetup.kt
+++ b/src/main/java/com/ffii/fpsms/modules/common/internalSetup/inventorySetup.kt
@@ -141,7 +141,7 @@ open class InventorySetup {
                 for (data in inventoryDataList) {
                     try {
                         // Find item by code (itemNo)
-                        val item = itemsRepository.findByCodeAndDeletedFalse(data.itemNo)
+                        val item = itemsRepository.findFirstByCodeAndDeletedFalse(data.itemNo)
 
                         if (item == null) {
                             println("NOT FOUND - Item with code '${data.itemNo}' does not exist")
diff --git a/src/main/java/com/ffii/fpsms/modules/master/entity/ItemsRepository.kt b/src/main/java/com/ffii/fpsms/modules/master/entity/ItemsRepository.kt
index 4d353f5..b655c4d 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/entity/ItemsRepository.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/entity/ItemsRepository.kt
@@ -54,4 +54,10 @@ interface ItemsRepository : AbstractRepository<Items, Long> {
         """
     )
     fun findByM18BomCode(m18BomCode: String): Items?;
+
+    @Query(
+        nativeQuery = true,
+        value = "SELECT * FROM items i WHERE i.code = :code AND i.deleted = false ORDER BY i.id LIMIT 1"
+    )
+    fun findFirstByCodeAndDeletedFalse(code: String): Items?
 }
\ No newline at end of file