diff --git a/src/poke_env/environment/battle.py b/src/poke_env/environment/battle.py
index b30ffe2fd..655baf728 100644
--- a/src/poke_env/environment/battle.py
+++ b/src/poke_env/environment/battle.py
@@ -123,14 +123,14 @@ def parse_request(self, request: Dict[str, Any]) -> None:
         if not self.trapped and not self.reviving:
             for pokemon in side["pokemon"]:
                 if pokemon:
-                    pokemon = self.get_pokemon(pokemon["ident"])
+                    pokemon = self._team[pokemon["ident"]]
                     if not pokemon.active and not pokemon.fainted:
                         self._available_switches.append(pokemon)
 
         if not self.trapped and self.reviving:
             for pokemon in side["pokemon"]:
                 if pokemon and pokemon.get("reviving", False):
-                    pokemon = self.get_pokemon(pokemon["ident"])
+                    pokemon = self._team[pokemon["ident"]]
                     if not pokemon.active:
                         self._available_switches.append(pokemon)