diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ae615e9..4b8e0709 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 1. [](#new)
     * Add ability to Sanitize SVGs on file upload
     * Add ability to Sanitize SVGs in Page media
+1. [](#improved)
+    * YAML linter report now supports multi-language
 1. [](#bugfix)
     * Fixed missing language for AJAX requests
     * Fixed redirect with absolute language URL
diff --git a/themes/grav/templates/reports/yamllinter.html.twig b/themes/grav/templates/reports/yamllinter.html.twig
index f5e31a71..920db046 100644
--- a/themes/grav/templates/reports/yamllinter.html.twig
+++ b/themes/grav/templates/reports/yamllinter.html.twig
@@ -2,15 +2,24 @@
     <div class="alert warning"><strong>YAML Linting:</strong> Found <strong>{{ result|length }}</strong> linting errors</div>
     <table>
         {% for path, error in result %}
-            {% set page_path = base_path ~ (path|pathinfo).dirname %}
+            {% set page_url = base_url_simple ~ '/' ~ admin_route %}
+            {% set bits = path|pathinfo %}
+            {% if admin.multilang %}
+                {% set lang = (bits.filename|pathinfo).extension %}
+                {% set page_url = base_url_simple ~ '/' ~ lang ~ '/' ~ admin_route %}
+            {% endif %}
+            {% set page_path = base_path ~ bits.dirname %}
             {% set page = grav.pages.get(page_path) %}
             <tr>
                 <td><i class="fa fa-file-text-o"></i>
                     {% if page.url %}
-                        <a href="{{ base_url ~ '/pages' ~ page.route }}/mode:expert">{{ page.route }}</a>
+                        <a href="{{ page_url ~ '/pages' ~ page.rawRoute }}/mode:expert">{{ page.route }}</a>
                     {% else %}
                         {{ path }}
                     {% endif %}
+                    {% if lang %}
+                        <span class="badge">{{ lang }}</span>
+                    {% endif %}
                 </td>
                 <td class="double">{{ error }}</td>
             </tr>