diff --git a/core/lib/Drupal/Core/Render/Element/HtmlTag.php b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
index 3d4bec9..71966e6 100644
--- a/core/lib/Drupal/Core/Render/Element/HtmlTag.php
+++ b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
@@ -84,14 +84,12 @@ public static function preRenderHtmlTag($element) {
     }
     // Construct all other elements.
     else {
-      $value_prefix = (isset($element['#value_prefix'])) ? $element['#value_prefix'] : '';
-      $value_suffix = (isset($element['#value_suffix'])) ? $element['#value_suffix'] : '';
       $markup = SafeMarkup::format("<@tag@attributes>@value_prefix@value@value_suffix</@tag>\n", [
         '@tag' => $element['#tag'],
         '@attributes' => $attributes,
-        '@value_prefix' => SafeMarkup::checkAdminXss($value_prefix),
+        '@value_prefix' => (isset($element['#value_prefix']) ? SafeMarkup::checkAdminXss($element['#value_prefix']) : ''),
         '@value' => SafeMarkup::checkAdminXss($element['#value']),
-        '@value_suffix' => SafeMarkup::checkAdminXss($value_suffix),
+        '@value_suffix' => (isset($element['#value_suffix']) ? SafeMarkup::checkAdminXss($element['#value_suffix']) : ''),
       ]);
     }
     if (!empty($element['#noscript'])) {