diff --git a/layouts/partials/search.html b/layouts/partials/search.html
index 4605958e7a..1813289f6f 100644
--- a/layouts/partials/search.html
+++ b/layouts/partials/search.html
@@ -1,6 +1,8 @@
         {{- $link := "" }}
-        {{- with .Site.Home.OutputFormats.Get "SEARCHPAGE" }}
-          {{- $link = partial "relLangPrettyUglyURL.hugo" (dict "to" .) }}
+        {{- if or (.Site.Home.OutputFormats.Get "JSON") (.Site.Home.OutputFormats.Get "SEARCH") }}
+          {{- with .Site.Home.OutputFormats.Get "SEARCHPAGE" }}
+            {{- $link = partial "relLangPrettyUglyURL.hugo" (dict "to" .) }}
+          {{- end }}
         {{- end }}
 {{- $c:="" }}        {{ if $link }}<form action="{{ $link }}" method="get">{{ end }}<div class="searchbox default-animation">
           {{ if $link }}<button type="submit" title="{{ T "Search" }} (CTRL+ALT+f)">{{ end }}<i class="fas fa-search"{{ if not $link }} title="{{ T "Search" }} (CTRL+ALT+f)"{{ end }}></i>{{ if $link }}</button>{{ end }}
diff --git a/static/js/search.js b/static/js/search.js
index 7ee0e9552d..66db3e012e 100644
--- a/static/js/search.js
+++ b/static/js/search.js
@@ -117,7 +117,7 @@ function search(term) {
     // Find the item in our index corresponding to the lunr one to have more info
     // Remove Lunr special search characters: https://lunrjs.com/guides/searching.html
     var searchTerm = lunr.tokenizer(term.replace(/[*:^~+-]/, ' ')).reduce( function(a,token){return a.concat(searchPatterns(token.str))}, []).join(' ');
-    return !searchTerm ? [] : lunrIndex.search(searchTerm).map(function(result) {
+    return !searchTerm || !lunrIndex ? [] : lunrIndex.search(searchTerm).map(function(result) {
         return { index: result.ref, matches: Object.keys(result.matchData.metadata) }
     });
 }
diff --git a/static/js/theme.js b/static/js/theme.js
index f792090143..a75651bdec 100644
--- a/static/js/theme.js
+++ b/static/js/theme.js
@@ -523,6 +523,9 @@ function printShortcutHandler( event ){
 
 function showSearch(){
     var s = document.querySelector( '#search-by' );
+    if( !s ){
+        return;
+    }
     var b = document.querySelector( 'body' );
     if( s == document.activeElement ){
         if( b.classList.contains( 'sidebar-flyout' ) ){