diff --git a/docs/static_site/src/_config.yml b/docs/static_site/src/_config.yml
index 826617f42c10..12987e85071f 100644
--- a/docs/static_site/src/_config.yml
+++ b/docs/static_site/src/_config.yml
@@ -37,7 +37,6 @@ description: >- # this means to ignore newlines until "baseurl:"
 twitter_username: apachemxnet
 github_username:  apache/incubator-mxnet
 youtube_username: apachemxnet
-default_version: 1.6
 versions: 
   - master
   - 1.6
diff --git a/docs/static_site/src/_config_beta.yml b/docs/static_site/src/_config_beta.yml
index fdfa7d04ce3e..eab611492fea 100644
--- a/docs/static_site/src/_config_beta.yml
+++ b/docs/static_site/src/_config_beta.yml
@@ -39,7 +39,6 @@ url: https://thomasdelteil.github.io
 twitter_username: apachemxnet
 github_username:  apache/incubator-mxnet
 youtube_username: apachemxnet
-default_version: 1.6
 versions: 
   - master
   - 1.6
diff --git a/docs/static_site/src/_config_prod.yml b/docs/static_site/src/_config_prod.yml
index d82dea1e261a..eeead943e320 100644
--- a/docs/static_site/src/_config_prod.yml
+++ b/docs/static_site/src/_config_prod.yml
@@ -39,7 +39,6 @@ twitter_username: apachemxnet
 github_username:  apache/incubator-mxnet
 youtube_username: apachemxnet
 google_analytics: UA-96378503-1
-default_version: 1.6
 versions: 
   - master
   - 1.6
diff --git a/docs/static_site/src/_includes/header.html b/docs/static_site/src/_includes/header.html
index 43cff15438a3..30f7bccf4689 100644
--- a/docs/static_site/src/_includes/header.html
+++ b/docs/static_site/src/_includes/header.html
@@ -41,14 +41,14 @@
           <input id="global-search" type="text" title="Search" placeholder="Search" />
           <div id="global-search-dropdown-container">
             <button class="gs-current-version btn" type="button" data-toggle="dropdown">
-                <span id="gs-current-version-label">{{site.default_version}}</span>
+                <span id="gs-current-version-label">{{site.versions[1]}}</span>
                 <svg class="gs-dropdown-caret" viewBox="0 0 32 32" class="icon icon-caret-bottom" aria-hidden="true">
                     <path class="dropdown-caret-path" d="M24 11.305l-7.997 11.39L8 11.305z"></path>
                 </svg>
             </button>
             <ul class="gs-opt-group gs-version-dropdown">
               {% for version in site.versions %}
-                {% if version == site.default_version %}
+                {% if version == site.versions[1] %}
                   <li class="gs-opt gs-versions active">{{version}}</li>
                 {% else %}
                   <li class="gs-opt gs-versions">{{version}}</li>
@@ -71,7 +71,7 @@
             </button>
             <ul class="gs-opt-group gs-version-dropdown-mobile">
               {% for version in site.versions %}
-                {% if version == site.default_version %}
+                {% if version == site.versions[1] %}
                   <li class="gs-opt gs-versions active">{{version}}</li>
                 {% else %}
                   <li class="gs-opt gs-versions">{{version}}</li>
diff --git a/docs/static_site/src/assets/js/globalSearch.js b/docs/static_site/src/assets/js/globalSearch.js
index a1c799ed72a5..bc2cf1b94c14 100644
--- a/docs/static_site/src/assets/js/globalSearch.js
+++ b/docs/static_site/src/assets/js/globalSearch.js
@@ -22,7 +22,7 @@
 */
 
 $(document).ready(function () {
-  const default_version = $("#gs-current-version-label").text();
+  const default_version = $("#gs-current-version-label").text() || "master";
   // bind docsearch
   const globalSearch = docsearch({
     apiKey: "500f8e78748bd043cc6e4ac130e8c0e7",
@@ -30,7 +30,6 @@ $(document).ready(function () {
     inputSelector: "#global-search",
     algoliaOptions: {
       facetFilters: ["version:" + default_version],
-      hitsPerPage: 5,
     },
     debug: false, // Set debug to true if you want to inspect the dropdown
   });