diff --git a/components/weapon/WeaponGrid/index.tsx b/components/weapon/WeaponGrid/index.tsx
index 44133528..d5107f3c 100644
--- a/components/weapon/WeaponGrid/index.tsx
+++ b/components/weapon/WeaponGrid/index.tsx
@@ -377,23 +377,26 @@ const WeaponGrid = (props: Props) => {
 
   const extraElement = (
     <ExtraContainer>
-      <ExtraWeaponsGrid
-        grid={appState.grid.weapons.allWeapons}
-        enabled={appState.party.extra}
-        editable={props.editable}
-        offset={numWeapons}
-        removeWeapon={removeWeapon}
-        updateExtra={props.updateExtra}
-        updateObject={receiveWeaponFromSearch}
-        updateUncap={initiateUncapUpdate}
-      />
-      <GuidebooksGrid
-        grid={appState.party.guidebooks}
-        editable={props.editable}
-        offset={numWeapons}
-        removeGuidebook={removeGuidebook}
-        updateObject={receiveGuidebookFromSearch}
-      />
+      {appState.party.raid && appState.party.raid.group.extra && (
+        <ExtraWeaponsGrid
+          grid={appState.grid.weapons.allWeapons}
+          enabled={appState.party.extra}
+          editable={props.editable}
+          offset={numWeapons}
+          removeWeapon={removeWeapon}
+          updateExtra={props.updateExtra}
+          updateObject={receiveWeaponFromSearch}
+          updateUncap={initiateUncapUpdate}
+        />
+      )}
+      {appState.party.raid && appState.party.raid.group.guidebooks && (
+        <GuidebooksGrid
+          grid={appState.party.guidebooks}
+          editable={props.editable}
+          removeGuidebook={removeGuidebook}
+          updateObject={receiveGuidebookFromSearch}
+        />
+      )}
     </ExtraContainer>
   )