diff --git a/modules/modes/rock_smash.py b/modules/modes/rock_smash.py
index 62f6dba9e..7cd48ac63 100644
--- a/modules/modes/rock_smash.py
+++ b/modules/modes/rock_smash.py
@@ -99,6 +99,12 @@ def on_battle_started(self, encounter: EncounterInfo | None) -> BattleAction | N
         return handle_encounter(encounter)
 
     def on_battle_ended(self, outcome: "BattleOutcome") -> None:
+        if outcome is BattleOutcome.Caught and not context.config.battle.save_after_catching:
+            context.message = (
+                "A Pokémon has been caught. Switching to manual mode so we don't lose it when soft-resetting."
+            )
+            context.set_manual_mode()
+
         if not outcome == BattleOutcome.Lost:
             assert_player_has_poke_balls()