diff --git a/components/extra/ExtraWeaponsGrid/index.tsx b/components/extra/ExtraWeaponsGrid/index.tsx
index 6dc39c6d..c42cc618 100644
--- a/components/extra/ExtraWeaponsGrid/index.tsx
+++ b/components/extra/ExtraWeaponsGrid/index.tsx
@@ -11,12 +11,10 @@ import classNames from 'classnames'
 // Props
 interface Props {
   grid: GridArray<GridWeapon>
-  enabled: boolean
   editable: boolean
   found?: boolean
   offset: number
   removeWeapon: (id: string) => void
-  updateExtra: (enabled: boolean) => void
   updateObject: (object: SearchableObject, position: number) => void
   updateUncap: (id: string, position: number, uncap: number) => void
 }
@@ -26,12 +24,9 @@ const EXTRA_WEAPONS_COUNT = 3
 
 const ExtraWeaponsGrid = ({
   grid,
-  enabled,
   editable,
-  found,
   offset,
   removeWeapon,
-  updateExtra,
   updateObject,
   updateUncap,
 }: Props) => {
@@ -40,16 +35,9 @@ const ExtraWeaponsGrid = ({
   const classes = classNames({
     ExtraWeapons: true,
     ContainerItem: true,
-    Disabled: !enabled,
   })
 
-  function onCheckedChange(checked: boolean) {
-    updateExtra(checked)
-  }
-
-  const disabledElement = <></>
-
-  const enabledElement = (
+  const extraWeapons = (
     <ul id="ExtraWeaponGrid">
       {Array.from(Array(EXTRA_WEAPONS_COUNT)).map((x, i) => {
         const itemClasses = classNames({
@@ -77,17 +65,8 @@ const ExtraWeaponsGrid = ({
     <div className={classes}>
       <div className="Header">
         <h3>{t('extra_weapons')}</h3>
-        {editable ? (
-          <Switch
-            name="ExtraWeapons"
-            checked={enabled}
-            onCheckedChange={onCheckedChange}
-          />
-        ) : (
-          ''
-        )}
       </div>
-      {enabled ? enabledElement : ''}
+      {extraWeapons}
     </div>
   )
 }
diff --git a/components/extra/GuidebooksGrid/index.tsx b/components/extra/GuidebooksGrid/index.tsx
index 25a8e859..81602925 100644
--- a/components/extra/GuidebooksGrid/index.tsx
+++ b/components/extra/GuidebooksGrid/index.tsx
@@ -12,7 +12,6 @@ import './index.scss'
 interface Props {
   grid: GuidebookList
   editable: boolean
-  offset: number
   removeGuidebook: (position: number) => void
   updateObject: (object: SearchableObject, position: number) => void
 }
@@ -28,28 +27,12 @@ const GuidebooksGrid = ({
 }: Props) => {
   const { t } = useTranslation('common')
 
-  const [enabled, setEnabled] = useState(false)
-
   const classes = classNames({
     Guidebooks: true,
     ContainerItem: true,
-    Disabled: !enabled,
   })
 
-  useEffect(() => {
-    console.log('Grid updated')
-    if (hasGuidebooks()) setEnabled(true)
-  }, [grid])
-
-  function hasGuidebooks() {
-    return grid && (grid[0] || grid[1] || grid[2])
-  }
-
-  function onCheckedChange(checked: boolean) {
-    setEnabled(checked)
-  }
-
-  const enabledElement = (
+  const guidebooks = (
     <ul id="GuidebooksGrid">
       {Array.from(Array(EXTRA_WEAPONS_COUNT)).map((x, i) => {
         const itemClasses = classNames({
@@ -75,21 +58,12 @@ const GuidebooksGrid = ({
     <div className={classes}>
       <div className="Header">
         <h3>{t('sephira_guidebooks')}</h3>
-        {editable ? (
-          <Switch
-            name="Guidebooks"
-            checked={enabled}
-            onCheckedChange={onCheckedChange}
-          />
-        ) : (
-          ''
-        )}
       </div>
-      {enabled ? enabledElement : ''}
+      {guidebooks}
     </div>
   )
 
-  return editable || (enabled && !editable) ? guidebookElement : <div />
+  return guidebookElement
 }
 
 export default GuidebooksGrid
diff --git a/components/weapon/WeaponGrid/index.tsx b/components/weapon/WeaponGrid/index.tsx
index d5107f3c..6e1588e3 100644
--- a/components/weapon/WeaponGrid/index.tsx
+++ b/components/weapon/WeaponGrid/index.tsx
@@ -380,11 +380,9 @@ const WeaponGrid = (props: Props) => {
       {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}
         />