diff --git a/core/Abstracts/Logger.php b/core/Abstracts/Logger.php
index 7f4b3c10..b18600b0 100644
--- a/core/Abstracts/Logger.php
+++ b/core/Abstracts/Logger.php
@@ -8,6 +8,7 @@ use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
 use Psr\Log\LoggerInterface;
 use Server\Events\OnAfterRequest;
+use Server\Events\OnWorkerStop;
 
 
 /**
@@ -44,6 +45,7 @@ class Logger implements LoggerInterface
 	public function init()
 	{
 		$this->eventProvider->on(OnAfterRequest::class, [$this, 'onAfterRequest']);
+		$this->eventProvider->on(OnWorkerStop::class, [$this, 'onAfterRequest']);
 	}
 
 
@@ -178,10 +180,11 @@ class Logger implements LoggerInterface
 	{
 		$loggers = implode(PHP_EOL, $this->_loggers);
 		$this->_loggers = [];
+		if (!empty($loggers)) {
+			$filename = storage('log-' . date('Y-m-d') . '.log', 'logs/');
 
-		$filename = storage('log-' . date('Y-m-d') . '.log', 'logs/');
-
-		file_put_contents($filename, $loggers);
+			file_put_contents($filename, $loggers);
+		}
 	}
 
 
diff --git a/http-server/Worker/OnServerWorker.php b/http-server/Worker/OnServerWorker.php
index 1e578f0d..2b2c76a9 100644
--- a/http-server/Worker/OnServerWorker.php
+++ b/http-server/Worker/OnServerWorker.php
@@ -154,7 +154,6 @@ class OnServerWorker extends \Server\Abstracts\Server
 		putenv('state=exit');
 
 		$this->eventDispatch->dispatch(new OnWorkerExit($server, $workerId));
-		$this->eventDispatch->dispatch(new OnAfterRequest());
 	}