diff --git a/templates/layout/page--system--401.html.twig b/templates/layout/page--system--401.html.twig
new file mode 100644
index 000000000..6ed75fe93
--- /dev/null
+++ b/templates/layout/page--system--401.html.twig
@@ -0,0 +1 @@
+{% include 'page--401.html.twig' %}
diff --git a/templates/layout/page--system--403.html.twig b/templates/layout/page--system--403.html.twig
new file mode 100644
index 000000000..2d5285657
--- /dev/null
+++ b/templates/layout/page--system--403.html.twig
@@ -0,0 +1 @@
+{% include 'page--403.html.twig' %}
diff --git a/templates/layout/page--system--404.html.twig b/templates/layout/page--system--404.html.twig
new file mode 100644
index 000000000..e58573824
--- /dev/null
+++ b/templates/layout/page--system--404.html.twig
@@ -0,0 +1 @@
+{% include 'page--404.html.twig' %}
diff --git a/templates/navigation/links--language-block.html.twig b/templates/navigation/links--language-block.html.twig
index f58f92452..e37cab9c9 100644
--- a/templates/navigation/links--language-block.html.twig
+++ b/templates/navigation/links--language-block.html.twig
@@ -39,6 +39,7 @@
         {% set language_link = '' %}
         {% set lang = item.link['#options']['#abbreviation'] %}
         {% set untranslated = item.link['#options']['#untranslated'] %}
+        {% set nolink = item.link['#options']['#nolink'] %}
         {% set alternative_language = not item.link['#options']['#primary_language'] %}
         {% set classes = ['language-link'] %}
         {% set ariaCurrent = null %}
@@ -50,7 +51,7 @@
         {% if not untranslated and not alternative_language and lang != current_langcode %}
           {% set language_link = path('<current>', {}, {'language': item.link['#options']['language']}) %}
           {% set element = 'a' %}
-        {% elseif lang == current_langcode %}
+        {% elseif lang == current_langcode and not nolink %}
           {% set language_link = path('<current>', {}, {'language': item.link['#options']['language']}) %}
           {% set element = 'a' %}
           {% set ariaCurrent = create_attribute({'aria-current': 'true'}) %}