diff --git a/lib/l10n.php b/lib/l10n.php
index 4560cb7dbb0..cd1d53bce0b 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -99,7 +99,7 @@ class OC_L10N{
 		$lang = $this->lang;
 		$this->app = true;
 		// Find the right language
-		if(is_null($lang)){
+		if(is_null($lang) || $lang == '') {
 			$lang = self::findLanguage($app);
 		}