diff --git a/packages/gatsby-theme-aio/package.json b/packages/gatsby-theme-aio/package.json
index 9e3fc9e5b0..537aba5a7e 100644
--- a/packages/gatsby-theme-aio/package.json
+++ b/packages/gatsby-theme-aio/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adobe/gatsby-theme-aio",
-  "version": "4.15.4",
+  "version": "4.15.5-rc2",
   "description": "The Adobe I/O theme for building markdown powered sites",
   "main": "index.js",
   "license": "Apache-2.0",
diff --git a/packages/gatsby-theme-aio/src/components/SideNav/index.js b/packages/gatsby-theme-aio/src/components/SideNav/index.js
index b4bc8e2a8e..3da8d9ec3a 100644
--- a/packages/gatsby-theme-aio/src/components/SideNav/index.js
+++ b/packages/gatsby-theme-aio/src/components/SideNav/index.js
@@ -12,7 +12,8 @@
 
 import React, { useState, useRef, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { Link as GatsbyLink } from 'gatsby';
+import { withPrefix } from 'gatsby';
+import { GatsbyLink } from '../GatsbyLink';
 import { isBrowser,   findSelectedTopPage,
   findSelectedTopPageMenu,
   rootFix,
@@ -156,7 +157,7 @@ const SideNav = ({versions, mainNavPages, selectedPages, selectedSubPages, setSh
                     setShowSideNav(false);
                   }
                 }}
-                to={pageHref}
+                to={withPrefix(pageHref)}
                 className="spectrum-SideNav-itemLink"
                 daa-ll={page.title}>
                 {page.title}
@@ -258,7 +259,7 @@ const SideNav = ({versions, mainNavPages, selectedPages, selectedSubPages, setSh
                     setShowSideNav(false);
                   }
                 }}
-                to={pageHref}
+                to={withPrefix(pageHref)}
                 className="spectrum-SideNav-itemLink"
                 daa-ll={page.title}>
                 { selectedMenuItem === page  && <CheckMark /> }