diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts
index 0417e7abc32..2dce046a800 100644
--- a/src/data/trainer-config.ts
+++ b/src/data/trainer-config.ts
@@ -1716,7 +1716,7 @@ export function getRandomPartyMemberFunc(
       level,
       trainerSlot,
       undefined,
-      false,
+      true, // Shiny lock all trainer Pokémon #TODO: does this affect Ivy's Ray?
       undefined,
       postProcess,
     );
@@ -1742,7 +1742,7 @@ function getSpeciesFilterRandomPartyMemberFunc(
         .getTrainerSpeciesForLevel(level, true, strength, waveIndex),
     );
 
-    return globalScene.addEnemyPokemon(species, level, trainerSlot, undefined, false, undefined, postProcess);
+    return globalScene.addEnemyPokemon(species, level, trainerSlot, undefined, true, undefined, postProcess);
   };
 }
 
diff --git a/src/field/trainer.ts b/src/field/trainer.ts
index 98919ebfa93..1cd14dc5848 100644
--- a/src/field/trainer.ts
+++ b/src/field/trainer.ts
@@ -422,6 +422,8 @@ export default class Trainer extends Phaser.GameObjects.Container {
           species,
           level,
           !this.isDouble() || !(index % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER,
+          false,
+          true, // shiny locking all trainer mons
         );
       },
       this.config.hasStaticParty