diff --git a/core/lib/Drupal/Core/Render/Element/HtmlTag.php b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
index 7d8daa3..f249146 100644
--- a/core/lib/Drupal/Core/Render/Element/HtmlTag.php
+++ b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
@@ -94,7 +94,7 @@ public static function preRenderHtmlTag($element) {
       $markup = SafeMarkup::set($markup);
     }
     if (!empty($element['#noscript'])) {
-      $element['#markup'] = SafeMarkup::format('<noscript> !markup </noscript>', array('!markup' => $markup));
+      $element['#markup'] = SafeMarkup::format('<noscript> @markup </noscript>', array('@markup' => $markup));
     }
     else {
       $element['#markup'] = $markup;
diff --git a/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php b/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php
index 53abbbe..b384021 100644
--- a/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php
@@ -75,7 +75,7 @@ public function providerPreRenderHtmlTag() {
 
     // No script tags.
     $element['#noscript'] = TRUE;
-    $tags[] = array($element, '<noscript><div class="test" id="id">value</div>' . "\n" . '</noscript>');
+    $tags[] = array($element, SafeMarkup::set('<noscript><div class="test" id="id">value</div>' . "\n" . '</noscript>'));
 
     return $tags;
   }