diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index 825d2730d0..d12bf32061 100644
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -102,13 +102,6 @@ class Drupal {
   protected static $container;
 
   /**
-   * The messenger.
-   *
-   * @var \Drupal\Core\Messenger\MessengerInterface
-   */
-  protected static $messenger;
-
-  /**
    * Sets a new global container.
    *
    * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
@@ -772,10 +765,7 @@ public static function time() {
    *   The messenger.
    */
   public static function messenger() {
-    if (static::$messenger === NULL) {
-      static::$messenger = new ChainedMessenger();
-    }
-    return static::$messenger;
+    return new ChainedMessenger();
   }
 
 }
diff --git a/core/lib/Drupal/Core/Messenger/ChainedMessenger.php b/core/lib/Drupal/Core/Messenger/ChainedMessenger.php
index 300666a87c..e1a7af71a1 100644
--- a/core/lib/Drupal/Core/Messenger/ChainedMessenger.php
+++ b/core/lib/Drupal/Core/Messenger/ChainedMessenger.php
@@ -99,10 +99,9 @@ public function getMessenger() {
       $messenger = \Drupal::service('messenger');
 
       // Merge in any LegacyMessenger messages and then remove it.
-      if (isset($this->legacyMessenger)) {
-        $this->transferMessages($this->legacyMessenger, $messenger);
-        unset($this->legacyMessenger);
-      }
+      // Initially the legacy messanger just for transfer messages reason.
+      $legacy_messanger = isset($this->legacyMessenger) ? $this->legacyMessenger : (new LegacyMessenger());
+      $this->transferMessages($legacy_messanger, $messenger);
 
       return $messenger;
     }