diff --git a/src/battle-phases.ts b/src/battle-phases.ts
index d24ec200968..8bbd8e7c583 100644
--- a/src/battle-phases.ts
+++ b/src/battle-phases.ts
@@ -2811,7 +2811,8 @@ export class SelectModifierPhase extends BattlePhase {
     const party = this.scene.getParty();
     regenerateModifierPoolThresholds(party, this.getPoolType());
     const modifierCount = new Utils.IntegerHolder(3);
-    this.scene.applyModifiers(ExtraModifierModifier, true, modifierCount);
+    if (this.isPlayer())
+      this.scene.applyModifiers(ExtraModifierModifier, true, modifierCount);
     const typeOptions: ModifierTypeOption[] = this.getModifierTypeOptions(modifierCount.value);
 
     const modifierSelectCallback = (cursor: integer) => {
diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 04e6cb7a6ca..f33dbebea83 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -1248,13 +1248,6 @@ export default class BattleScene extends Phaser.Scene {
 		});
 	}
 
-	generateEnemyBuffModifier(): void{
-		const enemyBuffModifierTypes = [ modifierTypes.ENEMY_DAMAGE_BOOSTER, modifierTypes.ENEMY_DAMAGE_REDUCTION ];
-		this.executeWithSeedOffset(() => {
-			(getModifierType(Phaser.Math.RND.pick(enemyBuffModifierTypes)).newModifier() as PersistentModifier).add(this.enemyModifiers, false);
-		}, Math.floor(this.currentBattle.waveIndex / 50));
-	}
-
 	clearEnemyHeldItemModifiers(): void {
 		const modifiersToRemove = this.enemyModifiers.filter(m => m instanceof PokemonHeldItemModifier);
 		for (let m of modifiersToRemove)