diff --git a/src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php b/src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php
index 29134115f3..37e641c578 100644
--- a/src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php
+++ b/src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bridge\Monolog\Handler;
 
 use Monolog\Handler\SwiftMailerHandler as BaseSwiftMailerHandler;
+use Symfony\Component\Console\Event\ConsoleTerminateEvent;
 use Symfony\Component\HttpKernel\Event\PostResponseEvent;
 
 /**
@@ -43,6 +44,16 @@ class SwiftMailerHandler extends BaseSwiftMailerHandler
         $this->instantFlush = true;
     }
 
+    /**
+     * After the CLI application has been terminated we will always flush messages
+     *
+     * @param ConsoleTerminateEvent $event
+     */
+    public function onCliTerminate(ConsoleTerminateEvent $event)
+    {
+        $this->instantFlush = true;
+    }
+
     /**
      * {@inheritdoc}
      */