diff --git a/src/components/WeaponGridUnit/WeaponGridUnit.tsx b/src/components/WeaponGridUnit/WeaponGridUnit.tsx
index 19348e50..fededbb0 100644
--- a/src/components/WeaponGridUnit/WeaponGridUnit.tsx
+++ b/src/components/WeaponGridUnit/WeaponGridUnit.tsx
@@ -10,10 +10,16 @@ import './WeaponGridUnit.css'
 function WeaponGridUnit(props: WeaponGridProps) {
     const { open, openModal, closeModal } = useModal()
 
+    let imgSrc = ''
+    if (props.weapon) {
+        const weapon = props.weapon!
+        imgSrc = gridImages[weapon.granblue_id]
+    }
+
     return (
         <li>
             <div className="WeaponGridUnit" onClick={openModal}>
-                <img className="grid_image" src={gridImages[props.weapon?.granblue_id]} />
+                <img className="grid_image" src={imgSrc} />
                 <span className='icon'><Plus /></span>
             </div>
             {open ? (