diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts
index 47453747c..e777c1125 100644
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@@ -1431,6 +1431,9 @@ function getNewModifierTypeOption(party: Pokemon[], poolType: ModifierPoolType,
       break;
     }
   }
+
+  if (index === undefined)
+    return null;
   
   if (player)
     console.log(index, ignoredPoolIndexes[tier].filter(i => i <= index).length, ignoredPoolIndexes[tier])
diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts
index be292a857..919fb217c 100644
--- a/src/modifier/modifier.ts
+++ b/src/modifier/modifier.ts
@@ -1891,7 +1891,7 @@ abstract class EnemyDamageMultiplierModifier extends EnemyPersistentModifier {
   }
 
   getMaxStackCount(scene: BattleScene): integer {
-    return 99;
+    return 999;
   }
 }