diff --git a/src/components/ExtraSummons/index.tsx b/src/components/ExtraSummons/index.tsx
index 0d44aa59..8c71d06c 100644
--- a/src/components/ExtraSummons/index.tsx
+++ b/src/components/ExtraSummons/index.tsx
@@ -16,6 +16,7 @@ interface Props {
     editable: boolean
     exists: boolean
     found?: boolean
+    offset: number
     onSelect: (type: GridType, summon: Summon, position: number) => void
 }
 
@@ -37,9 +38,9 @@ const ExtraSummons = (props: Props) => {
                                 <SummonUnit 
                                     editable={props.editable}
                                     onReceiveData={receiveWeapon} 
-                                    position={i} 
+                                    position={props.offset + i} 
                                     unitType={1}
-                                    summon={props.grid[i]}
+                                    summon={props.grid[props.offset + i]}
                                 />
                             </li>
                         )
diff --git a/src/components/ExtraWeapons/index.tsx b/src/components/ExtraWeapons/index.tsx
index ba9d70ca..6ed71447 100644
--- a/src/components/ExtraWeapons/index.tsx
+++ b/src/components/ExtraWeapons/index.tsx
@@ -17,6 +17,7 @@ interface Props {
     editable: boolean
     exists: boolean
     found?: boolean
+    offset: number
     onSelect: (type: GridType, weapon: Weapon, position: number) => void
 }
 
@@ -38,9 +39,9 @@ const ExtraWeapons = (props: Props) => {
                                 <WeaponUnit 
                                     editable={props.editable}
                                     onReceiveData={receiveWeapon} 
-                                    position={i} 
+                                    position={props.offset + i} 
                                     unitType={1}
-                                    weapon={props.grid[i]}
+                                    weapon={props.grid[props.offset + i]}
                                 />
                             </li>
                         )
diff --git a/src/components/SummonGrid/index.tsx b/src/components/SummonGrid/index.tsx
index e389dc95..02703f97 100644
--- a/src/components/SummonGrid/index.tsx
+++ b/src/components/SummonGrid/index.tsx
@@ -85,6 +85,7 @@ const SummonGrid = (props: Props) => {
                 grid={props.grid} 
                 editable={false} 
                 exists={false} 
+                offset={numSummons}
                 onSelect={
                     function (type: GridType, summon: Summon, position: number): void {
                         throw new Error('Function not implemented.')
diff --git a/src/components/WeaponGrid/index.tsx b/src/components/WeaponGrid/index.tsx
index 1eac1ab8..7f42d108 100644
--- a/src/components/WeaponGrid/index.tsx
+++ b/src/components/WeaponGrid/index.tsx
@@ -32,7 +32,8 @@ const WeaponGrid = (props: Props) => {
         <ExtraWeapons 
             grid={props.grid} 
             editable={props.editable} 
-            exists={false} 
+            exists={false}
+            offset={numWeapons}
             onSelect={
                 function (type: GridType, weapon: Weapon, position: number): void {
                     throw new Error('Function not implemented.')