diff --git a/src/battle-phases.ts b/src/battle-phases.ts
index cea47a9f8..8de20bbf3 100644
--- a/src/battle-phases.ts
+++ b/src/battle-phases.ts
@@ -100,7 +100,8 @@ export class CheckLoadPhase extends BattlePhase {
     
     if (!this.scene.gameData.hasSession())
       return this.end();
-
+    
+    this.scene.ui.setMode(Mode.MESSAGE);
     this.scene.ui.showText('You currently have a session in progress.\nWould you like to continue where you left off?', null, () => {
       this.scene.ui.setMode(Mode.CONFIRM, () => {
         this.scene.ui.setMode(Mode.MESSAGE);
diff --git a/src/data/move.ts b/src/data/move.ts
index 206f73d46..bd9fa62ce 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -2581,6 +2581,8 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
     return new Promise(resolve => {
+      if (move.category !== MoveCategory.STATUS && !this.getSwitchOutCondition()(user, target, move))
+        return resolve(false);
       const switchOutTarget = this.user ? user : target;
       if (switchOutTarget instanceof PlayerPokemon) {
         (switchOutTarget as PlayerPokemon).switchOut(this.batonPass).then(() => resolve(true));
@@ -2590,21 +2592,17 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
         switchOutTarget.resetSummonData();
         switchOutTarget.hideInfo();
         switchOutTarget.setVisible(false);
+        switchOutTarget.scene.field.remove(switchOutTarget);
 
         if (switchOutTarget.hp)
           user.scene.unshiftPhase(new SwitchSummonPhase(user.scene, switchOutTarget.getFieldIndex(), user.scene.currentBattle.trainer.getNextSummonIndex(), false, this.batonPass, false));
       } else {
-        switchOutTarget.hideInfo().then(() => switchOutTarget.destroy());
-        switchOutTarget.hp = 0;
-        switchOutTarget.trySetStatus(StatusEffect.FAINT);
-
-        user.scene.queueMessage(getPokemonMessage(switchOutTarget, ' fled!'), null, true, 500);
-
-        if (!switchOutTarget.getAlly()?.isActive(true)) {
-          user.scene.clearEnemyHeldItemModifiers();
-
-          user.scene.pushPhase(new BattleEndPhase(user.scene));
-          user.scene.pushPhase(new NewBattlePhase(user.scene));
+        switchOutTarget.setVisible(false);
+        
+        if (switchOutTarget.hp) {
+          switchOutTarget.hideInfo().then(() => switchOutTarget.destroy());
+          switchOutTarget.scene.field.remove(switchOutTarget);
+          user.scene.queueMessage(getPokemonMessage(switchOutTarget, ' fled!'), null, true, 500);
         }
       }
 
@@ -2613,6 +2611,10 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
   }
 
   getCondition(): MoveCondition {
+    return (user, target, move) => move.category !== MoveCategory.STATUS || this.getSwitchOutCondition()(user, target, move);
+  }
+
+  getSwitchOutCondition(): MoveCondition {
     return (user, target, move) => {
       const switchOutTarget = (this.user ? user : target);
       const player = switchOutTarget instanceof PlayerPokemon;