diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index 62c57ea8d37..dee251dcab8 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -809,6 +809,7 @@ export default class PartyUiHandler extends MessageUiHandler {
 
       // This is used when switching out using the Pokemon command (possibly holding a Baton held item).
       if ((option === PartyOption.PASS_BATON || option === PartyOption.SEND_OUT) && !this.selectCallback) {
+        this.clearOptions();
         (globalScene.getCurrentPhase() as CommandPhase).handleCommand(
           Command.POKEMON,
           this.cursor,