diff --git a/core/themes/stark/templates/overlay/overlay.html.twig b/core/themes/stark/templates/overlay/overlay.html.twig
index d64f3eb..e50110a 100644
--- a/core/themes/stark/templates/overlay/overlay.html.twig
+++ b/core/themes/stark/templates/overlay/overlay.html.twig
@@ -25,7 +25,7 @@
       <a id="overlay-close" href="#" class="overlay-close"><span class="element-invisible">{{ 'Close overlay' | t }}</span></a>
     </div>
     {% if tabs %}
-      <h2 class="element-invisible">{{ 'Primary tabs' | t }}</h2><ul id="overlay-tabs">{{ render(tabs) }}</ul>
+      <h2 class="element-invisible">{{ 'Primary tabs' | t }}</h2><ul id="overlay-tabs">{{ render_var(tabs) }}</ul>
     {% endif %}
   </div>
   <div id="overlay-content"{{ content_attributes }}>
diff --git a/core/themes/stark/templates/system/html.html.twig b/core/themes/stark/templates/system/html.html.twig
index d0329e1..ba1f9b7 100644
--- a/core/themes/stark/templates/system/html.html.twig
+++ b/core/themes/stark/templates/system/html.html.twig
@@ -41,12 +41,12 @@
  */
 #}
 <!DOCTYPE html>
-<html{{ html_attributes }}>
+<html{% if html_attributes %}{{ html_attributes }}{% endif %}>
   <head>
-    {{ head }}
+    {% if head %}{{ head }}{% endif %}
     <title>{{ head_title }}</title>
-    {{ styles }}
-    {{ scripts }}
+    {% if styles %}{{ styles }}{% endif %}
+    {% if scripts %}{{ scripts }}{% endif %}
   </head>
   <body class="{{ attributes.class }}"{{ attributes }}>
     <div id="skip-link">
@@ -54,8 +54,8 @@
         {{ 'Skip to main content' | t }}
       </a>
     </div>
-    {{ page_top }}
-    {{ page }}
-    {{ page_bottom }}
+    {% if page_top %}{{ page_top }}{% endif %}
+    {% if page %}{{ page }}{% endif %}
+    {% if page_bottom %}{{ page_bottom }}{% endif %}
   </body>
 </html>
diff --git a/core/themes/stark/templates/system/page.html.twig b/core/themes/stark/templates/system/page.html.twig
index 2ccebf7..2f91ae2 100644
--- a/core/themes/stark/templates/system/page.html.twig
+++ b/core/themes/stark/templates/system/page.html.twig
@@ -132,7 +132,7 @@
   <a id="main-content"></a>
 
     <div id="content" class="column">
-      {% if page.highlighted is defined %}<div id="highlighted">{{ render(page.highlighted) }}</div>{% endif %}
+      {% if page.highlighted is defined %}<div id="highlighted">{{ render_var(page.highlighted) }}</div>{% endif %}
       {{ title_prefix }}
       {% if title is defined %}<h1 class="title" id="page-title">{{ title }}</h1>{% endif %}
       {{ title_suffix }}
