diff --git a/lib/lib.php b/lib/lib.php
index 62ffa293..998e0429 100644
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -138,7 +138,7 @@
 				arsort($aLanguages);
 			}
 		}
-		if (!sizeof($aLanguages)) $aLanguages = array(CONST_Default_Language=>1);
+		if (!sizeof($aLanguages) && CONST_Default_Language) $aLanguages = array(CONST_Default_Language=>1);
 		foreach($aLanguages as $sLangauge => $fLangauagePref)
 		{
 			$aLangPrefOrder['short_name:'.$sLangauge] = 'short_name:'.$sLangauge;
diff --git a/settings/settings.php b/settings/settings.php
index 771cf80f..f2cdf918 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -56,7 +56,7 @@
 	@define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
 	@define('CONST_Tile_Default', 'Mapnik');
 
-	@define('CONST_Default_Language', 'xx');
+	@define('CONST_Default_Language', false);
 	@define('CONST_Default_Lat', 20.0);
 	@define('CONST_Default_Lon', 0.0);
 	@define('CONST_Default_Zoom', 2);