diff --git a/packages/medusa/src/services/claim-item.js b/packages/medusa/src/services/claim-item.js
index 8a508c9767..6b547a83e3 100644
--- a/packages/medusa/src/services/claim-item.js
+++ b/packages/medusa/src/services/claim-item.js
@@ -83,27 +83,35 @@ class ClaimItemService extends BaseService {
         )
       }
 
-      const claimTagRepo = manager.getCustomRepository(this.claimTagRepository_)
-      const tagsToAdd = await Promise.all(
-        tags.map(async t => {
-          const normalized = t.trim().toLowerCase()
-          const existing = await claimTagRepo.findOne({
-            where: { value: normalized },
+      let tagsToAdd = []
+      if (tags && tags.length) {
+        const claimTagRepo = manager.getCustomRepository(
+          this.claimTagRepository_
+        )
+        tagsToAdd = await Promise.all(
+          tags.map(async t => {
+            const normalized = t.trim().toLowerCase()
+            const existing = await claimTagRepo.findOne({
+              where: { value: normalized },
+            })
+            if (existing) {
+              return existing
+            }
+
+            return claimTagRepo.create({ value: normalized })
           })
-          if (existing) {
-            return existing
-          }
+        )
+      }
 
-          return claimTagRepo.create({ value: normalized })
+      let imagesToAdd = []
+      if (images && images.length) {
+        const claimImgRepo = manager.getCustomRepository(
+          this.claimImageRepository_
+        )
+        imagesToAdd = images.map(url => {
+          return claimImgRepo.create({ url })
         })
-      )
-
-      const claimImgRepo = manager.getCustomRepository(
-        this.claimImageRepository_
-      )
-      const imagesToAdd = images.map(url => {
-        return claimImgRepo.create({ url })
-      })
+      }
 
       const created = ciRepo.create({
         ...rest,