diff --git a/handlers/commands.py b/handlers/commands.py
index 5869199..791672f 100644
--- a/handlers/commands.py
+++ b/handlers/commands.py
@@ -1252,6 +1252,9 @@ class BotInterface:
 
     async def _show_user_menu(self, message: Message, edit: bool = False):
         user_id = message.from_user.id
+        # Сбрасываем все незавершённые состояния при возврате в меню
+        self._waiting_password.pop(user_id, None)
+        self._user_task_state.pop(user_id, None)
         balance = await self.balance_storage.get_balance(user_id)
         all_tasks = await self.task_manager.get_all_tasks()
         active = sum(