diff --git a/src/corelibs/logging_handling/log.py b/src/corelibs/logging_handling/log.py
index 2cec79a..c23a6ee 100644
--- a/src/corelibs/logging_handling/log.py
+++ b/src/corelibs/logging_handling/log.py
@@ -644,7 +644,7 @@ class Log(LogParent):
         if log_queue is None:
             return
         self.log_queue = log_queue
-        atexit.register(self._cleanup)
+        atexit.register(self.stop_listener)
         self.listener = logging.handlers.QueueListener(
             self.log_queue,
             *self.handlers.values(),
@@ -659,6 +659,7 @@ class Log(LogParent):
         if self.listener is not None:
             self.flush()
             self.listener.stop()
+        self._cleanup()
 
     # MARK: init main log
     def __init_log(self, log_name: str) -> None:
diff --git a/uv.lock b/uv.lock
index b10fdb1..d9fce59 100644
--- a/uv.lock
+++ b/uv.lock
@@ -44,7 +44,7 @@ wheels = [
 
 [[package]]
 name = "corelibs"
-version = "0.22.0"
+version = "0.22.2"
 source = { editable = "." }
 dependencies = [
     { name = "jmespath" },