diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php
index 0f5f4b97d..0b3be023c 100644
--- a/system/src/Grav/Common/Twig/Twig.php
+++ b/system/src/Grav/Common/Twig/Twig.php
@@ -80,7 +80,10 @@ class Twig
 
             $active_language = $language->getActive();
 
-            $language_append = $active_language ? '/'.$active_language : '';
+            $language_append = '';
+            if ($language->getDefault() != $active_language || $config->get('system.languages.include_default_lang') === true) {
+                $language_append = $active_language ? '/' . $active_language : '';
+            }
 
             // handle language templates if available
             if ($language->enabled()) {