diff --git a/src/data/challenge.ts b/src/data/challenge.ts
index 22d48432376..739ca336f01 100644
--- a/src/data/challenge.ts
+++ b/src/data/challenge.ts
@@ -790,22 +790,14 @@ export class SingleTypeChallenge extends Challenge {
   applyStarterSelectModify(speciesId: SpeciesId, dexEntry: DexEntry, _starterDataEntry: StarterDataEntry): boolean {
     const type = this.value - 1;
 
-    if (speciesId === SpeciesId.RALTS) {
-      if (type === PokemonType.FIGHTING) {
-        dexEntry.caughtAttr &= ~DexAttr.FEMALE;
-      }
-      if (type === PokemonType.FAIRY) {
-        dexEntry.caughtAttr &= ~DexAttr.MALE;
-      }
-    }
-    if (speciesId === SpeciesId.SNORUNT && type === PokemonType.GHOST) {
+    if (speciesId === SpeciesId.RALTS && type === PokemonType.FIGHTING) {
+      dexEntry.caughtAttr &= ~DexAttr.FEMALE;
+    } else if (speciesId === SpeciesId.SNORUNT && type === PokemonType.GHOST) {
       dexEntry.caughtAttr &= ~DexAttr.MALE;
-    }
-    if (speciesId === SpeciesId.BURMY) {
+    } else if (speciesId === SpeciesId.BURMY) {
       if (type === PokemonType.FLYING) {
         dexEntry.caughtAttr &= ~DexAttr.FEMALE;
-      }
-      if ([PokemonType.GRASS, PokemonType.GROUND, PokemonType.STEEL].includes(type)) {
+      } else if ([PokemonType.GRASS, PokemonType.GROUND, PokemonType.STEEL].includes(type)) {
         dexEntry.caughtAttr &= ~DexAttr.MALE;
       }
     }