diff --git a/src/phases/faint-phase.ts b/src/phases/faint-phase.ts
index eee1fd52938..8eb84beded5 100644
--- a/src/phases/faint-phase.ts
+++ b/src/phases/faint-phase.ts
@@ -65,6 +65,15 @@ export class FaintPhase extends PokemonPhase {
       }
     }
 
+    /** In case the current pokemon was just switched in, make sure it is counted as participating in the combat */
+    this.scene.getPlayerField().forEach((pokemon, i) => {
+      if (pokemon?.isActive(true)) {
+        if (pokemon.isPlayer()) {
+          this.scene.currentBattle.addParticipant(pokemon as PlayerPokemon);
+        }
+      }
+    });
+
     if (!this.tryOverrideForBattleSpec()) {
       this.doFaint();
     }