diff --git a/src/components/popups/Gym.jsx b/src/components/popups/Gym.jsx
index 2607f216b..264510c20 100644
--- a/src/components/popups/Gym.jsx
+++ b/src/components/popups/Gym.jsx
@@ -287,7 +287,7 @@ const DropdownOptions = ({
     })
   }
 
-  return options.map((option) => (
+  return options.filter(Boolean).map((option) => (
     <MenuItem key={option.key || option.name} onClick={option.action} dense>
       {typeof option.name === 'string' ? t(option.name) : option.name}
     </MenuItem>
@@ -508,8 +508,8 @@ const RaidInfo = ({
       return t(`costume_${costume}`, 'Unknown Costume')
     }
     if (form) {
-      const raidForm = pokemon[id].forms[form].name
-      if (raidForm === 'Normal') {
+      const raidForm = pokemon[id].forms[form]?.name
+      if (raidForm === 'Normal' || !raidForm) {
         return ''
       }
       return `${raidForm} ${t('form')}`