diff --git a/P3D/Battle/BattleSystemV2/QueryObjects/SwitchPokemonQueryObject.vb b/P3D/Battle/BattleSystemV2/QueryObjects/SwitchPokemonQueryObject.vb
index 96ccb0f5e..e8058df9e 100644
--- a/P3D/Battle/BattleSystemV2/QueryObjects/SwitchPokemonQueryObject.vb
+++ b/P3D/Battle/BattleSystemV2/QueryObjects/SwitchPokemonQueryObject.vb
@@ -166,6 +166,8 @@
                         Else
                             Dim TempQuery = TempScreen.BattleQuery.ToArray
                             If TempScreen.OwnPokemonIndex <> PokeIndex Then
+                                TempScreen.ParticipatedPokemon.Clear()
+                                TempScreen.ParticipatedPokemon.Add(PokeIndex)
                                 If TempScreen.IsRemoteBattle = True And TempScreen.IsHost = False Then
                                     TempScreen.OppFaint = False
                                     TempScreen.OwnStatistics.Switches += 1