diff --git a/src/partials/nav-explore.hbs b/src/partials/nav-explore.hbs
index c2338e1e..90e6b1a0 100644
--- a/src/partials/nav-explore.hbs
+++ b/src/partials/nav-explore.hbs
@@ -5,16 +5,12 @@
     <span class="dropdown-label">Neo4j Version</span>
 
     <select data-current="{{@root.page.version}}" class="version-selector dropdown-styles">
-      {{#with @root.page.componentVersion}}
-      <option value="" selected>
-        {{#unless (or @root.page.attributes.nav-hide-component-title (eq @root.page.attributes.theme 'cheat-sheet'))}} {{{ ./title }}} {{/unless}}{{ this.displayVersion }}{{#if (and @root.page.attributes.nav-indicate-latest (eq @root.page.version @root.page.latest.version)) }} (latest){{/if}}
-      </option>
-      {{/with}}
       {{#each page.versions}}
       {{#unless (or this.prerelease (and (eq this.version @root.page.version) (eq @root.page.attributes.theme 'cheat-sheet') ))}}
       <option
         data-version="{{this.displayVersion}}"
         value="{{{relativize this.url}}}"
+        {{#if (eq this.version @root.page.version)}} selected{{/if}}
         {{~#if this.missing}} disabled{{/if}}
       >
         {{ this.displayVersion }}{{#if (and @root.page.attributes.nav-indicate-latest (eq this.version @root.page.latest.version)) }} (latest){{/if}}
@@ -24,4 +20,4 @@
     </select>
   </div>
 </div>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/src/partials/nav-selectors.hbs b/src/partials/nav-selectors.hbs
index f22b7596..dc700f02 100644
--- a/src/partials/nav-selectors.hbs
+++ b/src/partials/nav-selectors.hbs
@@ -16,16 +16,12 @@
     <span class="dropdown-label">{{#with (or page.attributes.cheatsheet-product 'Product')}}{{this}}{{/with}} Version</span>
 
     <select data-current="{{@root.page.version}}" class="version-selector dropdown-styles">
-      {{#with @root.page.componentVersion}}
-      <option value="" selected>
-        Version {{ this.displayVersion }}{{#if (and @root.page.attributes.nav-indicate-latest (eq @root.page.version @root.page.latest.version)) }} (latest){{/if}}
-      </option>
-      {{/with}}
       {{#each page.versions}}
       {{#unless (or this.prerelease (and (eq this.version @root.page.version) (eq @root.page.attributes.theme 'cheat-sheet') ))}}
       <option
         data-version="{{this.displayVersion}}"
         value="{{{relativize this.url}}}"
+        {{#if (eq this.version @root.page.version)}} selected{{/if}}
         {{~#if this.missing}} disabled{{/if}}
       >
         Version {{ this.displayVersion }}{{#if (and @root.page.attributes.nav-indicate-latest (eq this.version @root.page.latest.version)) }} (latest){{/if}}