diff --git a/src/courseware/CoursewareRedirectLandingPage.jsx b/src/courseware/CoursewareRedirectLandingPage.jsx
index f27ad730..246a5404 100644
--- a/src/courseware/CoursewareRedirectLandingPage.jsx
+++ b/src/courseware/CoursewareRedirectLandingPage.jsx
@@ -1,7 +1,8 @@
 import React from 'react';
-import { Switch, Route, useRouteMatch } from 'react-router';
+import { Switch, useRouteMatch } from 'react-router';
 import { getConfig } from '@edx/frontend-platform';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
+import { PageRoute } from '@edx/frontend-platform/react';
 
 import PageLoading from '../generic/PageLoading';
 import CoursewareRedirect from './CoursewareRedirect';
@@ -20,17 +21,17 @@ export default () => {
       />
 
       <Switch>
-        <Route
+        <PageRoute
           path={`${path}/courseware/:courseId/unit/:unitId`}
           component={CoursewareRedirect}
         />
-        <Route
+        <PageRoute
           path={`${path}/course-home/:courseId`}
           render={({ match }) => {
             global.location.assign(`${getConfig().LMS_BASE_URL}/courses/${match.params.courseId}/course/`);
           }}
         />
-        <Route
+        <PageRoute
           path={`${path}/dashboard`}
           render={({ location }) => {
             global.location.assign(`${getConfig().LMS_BASE_URL}/dashboard${location.search}`);
diff --git a/src/index.jsx b/src/index.jsx
index c7641626..1b6cb834 100755
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -5,10 +5,10 @@ import {
   APP_INIT_ERROR, APP_READY, subscribe, initialize,
   mergeConfig,
 } from '@edx/frontend-platform';
-import { AppProvider, ErrorPage } from '@edx/frontend-platform/react';
+import { AppProvider, ErrorPage, PageRoute } from '@edx/frontend-platform/react';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Route, Switch } from 'react-router-dom';
+import { Switch } from 'react-router-dom';
 
 import { messages as headerMessages } from '@edx/frontend-component-header';
 import Footer, { messages as footerMessages } from '@edx/frontend-component-footer';
@@ -35,28 +35,28 @@ subscribe(APP_READY, () => {
     <AppProvider store={initializeStore()}>
       <UserMessagesProvider>
         <Switch>
-          <Route path="/redirect" component={CoursewareRedirectLandingPage} />
-          <Route path="/course/:courseId/home">
+          <PageRoute path="/redirect" component={CoursewareRedirectLandingPage} />
+          <PageRoute path="/course/:courseId/home">
             <TabContainer tab="outline" fetch={fetchOutlineTab} slice="courseHome">
               <OutlineTab />
             </TabContainer>
-          </Route>
-          <Route path="/course/:courseId/dates">
+          </PageRoute>
+          <PageRoute path="/course/:courseId/dates">
             <TabContainer tab="dates" fetch={fetchDatesTab} slice="courseHome">
               <DatesTab />
             </TabContainer>
-          </Route>
-          <Route path="/course/:courseId/progress">
+          </PageRoute>
+          <PageRoute path="/course/:courseId/progress">
             <TabContainer tab="progress" fetch={fetchProgressTab} slice="courseHome">
               <ProgressTab />
             </TabContainer>
-          </Route>
-          <Route path="/course/:courseId/course-exit">
+          </PageRoute>
+          <PageRoute path="/course/:courseId/course-exit">
             <TabContainer tab="courseware" fetch={fetchCourse} slice="courseware">
               <CourseExit />
             </TabContainer>
-          </Route>
-          <Route
+          </PageRoute>
+          <PageRoute
             path={[
               '/course/:courseId/:sequenceId/:unitId',
               '/course/:courseId/:sequenceId',