diff --git a/src/LabelsExtension.php b/src/LabelsExtension.php
index 0d99ccf..12f58c7 100644
--- a/src/LabelsExtension.php
+++ b/src/LabelsExtension.php
@@ -173,11 +173,8 @@ public function twigL($label, $lang = false)
         /** @var Labels $labels */
         $labels = $app['labels'];
         $label = $labels->cleanLabel($label);
-        $lang = mb_strtolower($lang);
+        $lang = $this->isValidLanguage($lang) ? mb_strtolower($lang) : $this->getCurrentLanguage();
 
-        if (!$this->isValidLanguage($lang)) {
-            $lang = $this->getCurrentLanguage();
-        }
         $savedLabels = $labels->getLabels();
         $savedLabel = $savedLabels->getPath("$label/$lang");
 
@@ -187,7 +184,7 @@ public function twigL($label, $lang = false)
         }
 
         // If we're automatically saving new/missing labels, add it to the JSON file
-        if ($config->isAddMissing() && !$savedLabels->hasItem($label)) {
+        if ($config->isAddMissing() && $this->isValidLanguage($lang) && !$savedLabels->hasItem($label)) {
             $labels->addLabel($label);
         }