diff --git a/components/WeaponKeySelect/index.tsx b/components/WeaponKeySelect/index.tsx
index a1bc39ee..e430635a 100644
--- a/components/WeaponKeySelect/index.tsx
+++ b/components/WeaponKeySelect/index.tsx
@@ -92,7 +92,7 @@ const WeaponKeySelect = React.forwardRef<HTMLButtonElement, Props>(
         name = pendulumNames[1]
       else if (props.series == 3) name = telumaNames[0]
       else if (props.series == 17) name = gauphNames[props.slot]
-      else if (props.series == 22) name = emblemNames[index]
+      else if (props.series == 24) name = emblemNames[index]
 
       return (
         <SelectGroup
@@ -116,7 +116,7 @@ const WeaponKeySelect = React.forwardRef<HTMLButtonElement, Props>(
       if (props.series == 2) name = pendulumNames[0].en
       else if (props.series == 3) name = telumaNames[0].en
       else if (props.series == 17) name = gauphNames[props.slot].en
-      else if (props.series == 22) name = emblemNames[0].en
+      else if (props.series == 24) name = emblemNames[0].en
 
       return `No ${name}`
     }
diff --git a/components/WeaponModal/index.tsx b/components/WeaponModal/index.tsx
index 7eea8156..796de3d4 100644
--- a/components/WeaponModal/index.tsx
+++ b/components/WeaponModal/index.tsx
@@ -224,6 +224,18 @@ const WeaponModal = (props: Props) => {
         ) : (
           ''
         )}
+
+        {props.gridWeapon.object.series == 24 &&
+        props.gridWeapon.object.uncap.ulb ? (
+          <WeaponKeySelect
+            currentValue={weaponKey1 != null ? weaponKey1 : undefined}
+            series={props.gridWeapon.object.series}
+            slot={0}
+            onChange={receiveWeaponKey}
+          />
+        ) : (
+          ''
+        )}
       </section>
     )
   }