diff --git a/module/retire/retirement.py b/module/retire/retirement.py
index 29c3186df..1bd429ac1 100644
--- a/module/retire/retirement.py
+++ b/module/retire/retirement.py
@@ -348,6 +348,7 @@ def handle_retirement(self):
                 self._retire_handler(mode='one_click_retire')
                 self._unable_to_enhance = False
                 self.interval_reset(IN_RETIREMENT_CHECK)
+                self.map_cat_attack_timer.reset()
                 return True
         elif self.config.Retirement_RetireMode == 'enhance':
             if self.appear_then_click(RETIRE_APPEAR_3, offset=(20, 20), interval=3):
@@ -367,16 +368,19 @@ def handle_retirement(self):
                     logger.info('Too few spare docks, retire next time')
                     self._unable_to_enhance = True
                 self.interval_reset(DOCK_CHECK)
+                self.map_cat_attack_timer.reset()
                 return True
         else:
             if self.appear_then_click(RETIRE_APPEAR_1, offset=(20, 20), interval=3):
                 self.interval_clear(IN_RETIREMENT_CHECK)
                 self.interval_reset([AUTO_SEARCH_MAP_OPTION_OFF, AUTO_SEARCH_MAP_OPTION_ON])
+                self.map_cat_attack_timer.reset()
                 return False
             if self.appear(IN_RETIREMENT_CHECK, offset=(20, 20), interval=10):
                 self._retire_handler()
                 self._unable_to_enhance = False
                 self.interval_reset(IN_RETIREMENT_CHECK)
+                self.map_cat_attack_timer.reset()
                 return True
 
         return False