diff --git a/C4/Languages.pm b/C4/Languages.pm
index 8a8ae2e25f..448f47b71f 100644
--- a/C4/Languages.pm
+++ b/C4/Languages.pm
@@ -161,12 +161,6 @@ Returns a reference to an array of hashes:
 
 sub getAllLanguages {
     my $languages_loop = [
-        {
-            language_code          => "",
-            language_name => "No Limit",
-            language_locale_name   => "",
-            selected       => "selected",
-        },
         {
             language_code          => "ara",
             language_name =>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
index 9b7c4790a4..aa3e210e85 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
@@ -109,6 +109,7 @@
 <!-- LANGUAGE LIMIT -->
 		<p><label for="language-limit">Language: </label>                                        
 		<select name="limit">
+		<option value="">No Limit</option>
 		<!-- TMPL_LOOP NAME="search_languages_loop" -->
 		<option value="ln:<!-- TMPL_VAR NAME="language_code" -->" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="language_name" --> <!-- TMPL_IF NAME="language_locale_name" -->(<!-- TMPL_VAR NAME="language_locale_name" -->)<!-- /TMPL_IF --></option>
 		<!-- /TMPL_LOOP -->