diff --git a/core/lib/Drupal/Core/Render/Element/HtmlTag.php b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
index f0c78bb..321d89d 100644
--- a/core/lib/Drupal/Core/Render/Element/HtmlTag.php
+++ b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
@@ -181,13 +181,13 @@ public static function preRenderConditionalComments($element) {
     // data coming in was at least admin escaped.
     if (!$browsers['!IE']) {
       // "downlevel-hidden".
-      $element['#prefix'] = SafeMarkup::set("\n<!--[if $expression]>\n" . $prefix);
-      $element['#suffix'] = SafeMarkup::set($suffix . "<![endif]-->\n");
+      $element['#prefix'] = SafeMarkup::format("\n<!--[if @expression]>\n@prefix", ['@expression' => $expression, '@prefix' => $prefix]);
+      $element['#suffix'] = SafeMarkup::format("@suffix<![endif]-->\n", ['@suffix' => $suffix]);
     }
     else {
       // "downlevel-revealed".
-      $element['#prefix'] = SafeMarkup::set("\n<!--[if $expression]><!-->\n" . $prefix);
-      $element['#suffix'] = SafeMarkup::set($suffix . "<!--<![endif]-->\n");
+      $element['#prefix'] = SafeMarkup::format("\n<!--[if @expression]><!-->\n@prefix", ['@expression' => $expression, '@prefix' => $prefix]);
+      $element['#suffix'] = SafeMarkup::format("@suffix<!--<![endif]-->\n", ['@suffix' => $suffix]);
     }
 
     return $element;