diff --git a/src/components/importBar/enka.tsx b/src/components/importBar/enka.tsx
index 49a2ba5..138a0df 100644
--- a/src/components/importBar/enka.tsx
+++ b/src/components/importBar/enka.tsx
@@ -79,16 +79,18 @@ export default function EnkaImport() {
                     avatar_id: character.avatarId,
                     rank: character.rank ?? 0,
                     level: character.level,
-                    lightcone: {
+                    lightcone: (character.equipment && character.equipment.tid) ? {
                         level: character.equipment?.level ?? 0,
                         rank: character.equipment?.rank ?? 0,
                         item_id: character.equipment?.tid ?? 0,
-                    },
-                    relics: character.relicList.map((relic) => ({
-                        level: relic.level,
-                        relic_id: relic.tid,
-                        relic_set_id: parseInt(relic.tid.toString().slice(1, -1), 10),
-                    })),
+                    } : null,
+                    relics: character.relicList.map((relic) => {
+                        return {
+                            level: relic.level,
+                            relic_id: relic.tid,
+                            relic_set_id: parseInt(relic.tid.toString().slice(1, -1), 10),
+                        }
+                    }),
                 } as CharacterInfoCardType
             }));
         }
diff --git a/src/helper/converterToAvatarStore.ts b/src/helper/converterToAvatarStore.ts
index d56dca4..22f03c9 100644
--- a/src/helper/converterToAvatarStore.ts
+++ b/src/helper/converterToAvatarStore.ts
@@ -45,12 +45,12 @@ export function converterOneEnkaDataToAvatarStore(data: AvatarEnkaDetail, count:
     if (!data.equipment && (!data.relicList || data.relicList.length === 0)) return null
     const profile: AvatarProfileStore = {
         profile_name: `Enka Profile ${count}`,
-        lightcone: {
+        lightcone:  (data.equipment && data.equipment.tid) ? {
             level: data.equipment?.level ?? 0,
             item_id: data.equipment?.tid ?? 0,
             rank: data.equipment?.rank ?? 0,
             promotion: data.equipment?.promotion ?? 0,
-        },
+        } : null,
         relics: Object.fromEntries(data.relicList.map((relic) => [relic.tid.toString()[relic.tid.toString().length - 1], {
             level: relic.level ?? 0,
             relic_id: relic.tid,
@@ -89,12 +89,12 @@ export function converterOneFreeSRDataToAvatarStore(data: FreeSRJson, count: num
 
     const profile: AvatarProfileStore = {
         profile_name: `FreeSR Profile ${count}`,
-        lightcone: {
+        lightcone: (lightcone && lightcone.item_id) ? {
             level: lightcone?.level ?? 0,
             item_id: lightcone?.item_id ?? 0,
             rank: lightcone?.rank ?? 0,
             promotion: lightcone?.promotion ?? 0,
-        },
+        } : null,
         relics: relicsMap
     }
     return profile