diff --git a/components/WeaponUnit/index.tsx b/components/WeaponUnit/index.tsx
index 93f7ee2d..d67fa680 100644
--- a/components/WeaponUnit/index.tsx
+++ b/components/WeaponUnit/index.tsx
@@ -65,9 +65,9 @@ const WeaponUnit = (props: Props) => {
                     type="weapon"
                     ulb={weapon?.uncap.ulb || false} 
                     flb={weapon?.uncap.flb || false}
-                    uncapLevel={props.gridWeapon?.uncapLevel!}
                     updateUncap={passUncapData}
                 />
+                        uncapLevel={gridWeapon.uncap_level}
             </div>
         </div>
     )
diff --git a/types/GridWeapon.d.ts b/types/GridWeapon.d.ts
index af920b85..3a6c2aa4 100644
--- a/types/GridWeapon.d.ts
+++ b/types/GridWeapon.d.ts
@@ -1,7 +1,7 @@
 interface GridWeapon {
     id: string
     mainhand: boolean
-    position: number | null
+    position: number
     weapon: Weapon
-    uncapLevel: number | null
+    uncap_level: number
 }
\ No newline at end of file