diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 2ff5d718ede..8fe6c85263d 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -1394,9 +1394,9 @@ export default class BattleScene extends SceneBase {
     if (double === undefined && newWaveIndex > 1) {
       if (newBattleType === BattleType.WILD && !this.gameMode.isWaveFinal(newWaveIndex)) {
         newDouble = !randSeedInt(this.getDoubleBattleChance(newWaveIndex, playerField));
+      } else if (newBattleType === BattleType.TRAINER) {
+        newDouble = newTrainer?.variant === TrainerVariant.DOUBLE;
       }
-    } else if (double === undefined && newBattleType === BattleType.TRAINER) {
-      newDouble = newTrainer?.variant === TrainerVariant.DOUBLE;
     } else if (!battleConfig) {
       newDouble = !!double;
     }
diff --git a/test/moves/whirlwind.test.ts b/test/moves/whirlwind.test.ts
index b0ca1783f2f..6b5133ec7b1 100644
--- a/test/moves/whirlwind.test.ts
+++ b/test/moves/whirlwind.test.ts
@@ -163,6 +163,7 @@ describe("Moves - Whirlwind", () => {
 
   it("should not pull in the other trainer's pokemon in a partner trainer battle", async () => {
     game.override
+      .startingWave(2)
       .battleType(BattleType.TRAINER)
       .randomTrainer({
         trainerType: TrainerType.BREEDER,