diff --git a/src/Entity/MessageTemplate.php b/src/Entity/MessageTemplate.php
index 9abb768cf7f56262d2a5a17e401d00b4026b1605..ad82fce1c411c6fc1508421c44eb318628fefacf 100644
--- a/src/Entity/MessageTemplate.php
+++ b/src/Entity/MessageTemplate.php
@@ -264,9 +264,8 @@ class MessageTemplate extends ConfigEntityBundleBase implements MessageTemplateI
     if ($language_manager instanceof ConfigurableLanguageManagerInterface) {
 
       if ($langcode == Language::LANGCODE_NOT_SPECIFIED) {
-        // Get the default language code when not specified.
-        $langcode = $language_manager->getDefaultLanguage()->getId();
-      }
+        // Get the current language code when not specified.
+        $langcode = $language_manager->getCurrentLanguage()->getId();      }
 
       if ($this->langcode !== $langcode) {
         $config_translation = $language_manager->getLanguageConfigOverride($langcode, 'message.template.' . $this->id());