diff --git a/templates/base.html.twig b/templates/base.html.twig
index a063a26f1..9e65587d5 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -26,7 +26,7 @@
     <body id="{% block body_id %}{% endblock %}">
 
         {% block header %}
-            {% set _route = app.request.get('_route') %}
+            {% set _route = app.current_route %}
             <header>
                 <nav class="navbar navbar-expand-lg fixed-top navbar-dark bg-primary">
                     <div class="container">
diff --git a/templates/default/_language_selector.html.twig b/templates/default/_language_selector.html.twig
index 6cf65bb90..93e418938 100644
--- a/templates/default/_language_selector.html.twig
+++ b/templates/default/_language_selector.html.twig
@@ -27,7 +27,7 @@
                             {% set is_active = app.request.locale == locale.code %}
                             {% set is_rtl = locale.code in ['ar', 'fa', 'he'] %}
                             <li class="{{ is_active ? 'active' }} {{ is_rtl ? 'rtl' }}" translate="no">
-                                <a class="stretched-link" lang="{{ locale.code }}" hreflang="{{ locale.code }}" href="{{ path(app.request.get('_route', 'blog_index'), app.request.get('_route_params', [])|merge({_locale: locale.code})) }}">
+                                <a class="stretched-link" lang="{{ locale.code }}" hreflang="{{ locale.code }}" href="{{ path(app.current_route ?? 'blog_index', app.current_route_parameters|merge({_locale: locale.code})) }}">
                                     {{ locale.name|capitalize }}
                                     <small>{{ locale.code }}</small>
                                 </a>
