diff --git a/bin/pt-agent b/bin/pt-agent
index ba30d106..b82152c6 100755
--- a/bin/pt-agent
+++ b/bin/pt-agent
@@ -5066,6 +5066,10 @@ sub stop_online_logging {
 
 sub DESTROY {
    my $self = shift;
+   foreach my $log_entry ( shift @{$self->_buffer} ) {
+      last unless defined $log_entry;
+      $self->_queue_log_entry(@$log_entry);
+   }
    $self->stop_online_logging();
    return;
 }
diff --git a/lib/Percona/Agent/Logger.pm b/lib/Percona/Agent/Logger.pm
index 3341ce90..973a7347 100644
--- a/lib/Percona/Agent/Logger.pm
+++ b/lib/Percona/Agent/Logger.pm
@@ -282,6 +282,10 @@ sub stop_online_logging {
 
 sub DESTROY {
    my $self = shift;
+   foreach my $log_entry ( shift @{$self->_buffer} ) {
+      last unless defined $log_entry;
+      $self->_queue_log_entry(@$log_entry);
+   }
    $self->stop_online_logging();
    return;
 }