diff --git a/src/AppEntry.js b/src/AppEntry.js
index cce83d75a..5263c7141 100644
--- a/src/AppEntry.js
+++ b/src/AppEntry.js
@@ -9,7 +9,7 @@ import '@patternfly/react-styles/css/components/Select/select.css';
 
 const AppEntry = () => (
   <Provider store={store}>
-    <BrowserRouter basename={routerHelpers.baseName}>
+    <BrowserRouter basename={routerHelpers.dynamicBaseName()}>
       <App />
     </BrowserRouter>
   </Provider>
diff --git a/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap b/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap
index 3a4dc0dd9..d1f4dc9ea 100644
--- a/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap
+++ b/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap
@@ -301,7 +301,7 @@ exports[`Authentication Component should return a message on 401 error: 401 erro
 
 exports[`Authentication Component should return a redirect on 418 error: 418 error 1`] = `
 <Redirect
-  baseName="/"
+  baseName="/subscriptions"
   isForced={false}
   route="/optin"
   routes={
@@ -441,7 +441,7 @@ exports[`Authentication Component should return a redirect on a specific 403 err
 
 exports[`Authentication Component should return a redirect on a specific 403 error and error code: 403 redirect error 1`] = `
 <Redirect
-  baseName="/"
+  baseName="/subscriptions"
   isForced={false}
   route="/optin"
   routes={
diff --git a/src/components/router/__tests__/__snapshots__/redirect.test.js.snap b/src/components/router/__tests__/__snapshots__/redirect.test.js.snap
index 02b30068a..bb2b46ce2 100644
--- a/src/components/router/__tests__/__snapshots__/redirect.test.js.snap
+++ b/src/components/router/__tests__/__snapshots__/redirect.test.js.snap
@@ -10,7 +10,7 @@ exports[`Redirect Component should handle a forced redirect: forced route 1`] =
 exports[`Redirect Component should handle a forced redirect: forced route, replace 1`] = `
 Array [
   Array [
-    "/dolor?dolor=sit",
+    "/subscriptions/dolor?dolor=sit",
   ],
 ]
 `;
diff --git a/src/components/router/redirect.js b/src/components/router/redirect.js
index 1135a62d9..43f7abe85 100644
--- a/src/components/router/redirect.js
+++ b/src/components/router/redirect.js
@@ -58,7 +58,7 @@ Redirect.propTypes = {
  *    isForced: boolean}}
  */
 Redirect.defaultProps = {
-  baseName: routerHelpers.baseName,
+  baseName: routerHelpers.dynamicBaseName(),
   isForced: false,
   route: null,
   routes: routerHelpers.routes,
diff --git a/src/components/router/router.js b/src/components/router/router.js
index 76a8e0a76..2e29b5f1d 100644
--- a/src/components/router/router.js
+++ b/src/components/router/router.js
@@ -59,7 +59,7 @@ const Router = ({ routes } = {}) => {
               };
 
               const routeDetail = {
-                baseName: routerHelpers.baseName,
+                baseName: routerHelpers.dynamicBaseName(),
                 errorRoute: activateOnErrorRoute,
                 routes,
                 routeItem: { ...item },