diff --git a/include/nav.php b/include/nav.php
index 626caf981..dd11f10d5 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -200,7 +200,7 @@ EOT;
 
 	$a->page['nav'] .= replace_macros($tpl, array(
         '$baseurl' => $a->get_baseurl(),
-		'$langselector' => lang_selector(),
+		'$langselector' => ((get_config('system','select_language')) ? lang_selector() : ''),
 		'$sitelocation' => $sitelocation,
 		'$nav' => $nav,
 		'$banner' =>  $banner,
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 7c26609c3..713280808 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -148,5 +148,5 @@
 	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
 </ul>
 
-<div id="langselector" >{{$langselector}}</div>
+{{if $langselector}}<div id="langselector" >{{$langselector}}</div>{{/if}}
 <div id="panel" style="display: none;"></div>