diff --git a/rdagent/log/logger.py b/rdagent/log/logger.py
index 8a17768d..2c7c81ea 100644
--- a/rdagent/log/logger.py
+++ b/rdagent/log/logger.py
@@ -70,8 +70,10 @@ class RDAgentLog(SingletonBaseClass):
 
         # TODO: It may result in error in mutithreading or co-routine
         self._tag = self._tag + tag
-        yield
-        self._tag = self._tag[: -len(tag)]
+        try:
+            yield
+        finally:
+            self._tag = self._tag[: -len(tag)]
 
     def get_pids(self) -> str:
         """