diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 962b9c8ca91..8205c1fcebc 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -3448,8 +3448,6 @@ export default class BattleScene extends SceneBase {
         for (const modifier of modifiers) {
           this.addEnemyModifier(modifier, true, true);
         }
-
-        this.currentBattle.trainer.genAI(party);
       }
 
       party.forEach((enemyPokemon: EnemyPokemon, i: number) => {
diff --git a/src/phases/encounter-phase.ts b/src/phases/encounter-phase.ts
index 9485e77e5aa..ea8e43faeeb 100644
--- a/src/phases/encounter-phase.ts
+++ b/src/phases/encounter-phase.ts
@@ -253,7 +253,10 @@ export class EncounterPhase extends BattlePhase {
         globalScene.getEnemyField().forEach(enemy => {
           overrideHeldItems(enemy, false);
         });
+      }
 
+      if (battle.battleType === BattleType.TRAINER) {
+        globalScene.currentBattle.trainer!.genAI(globalScene.getEnemyParty());
       }
 
       globalScene.ui.setMode(Mode.MESSAGE).then(() => {