diff --git a/dashboard/src/containers/RoutesContainer/Routes.tsx b/dashboard/src/containers/RoutesContainer/Routes.tsx
index 8208f684a55..7940fdbf6a1 100644
--- a/dashboard/src/containers/RoutesContainer/Routes.tsx
+++ b/dashboard/src/containers/RoutesContainer/Routes.tsx
@@ -51,16 +51,11 @@ class Routes extends React.Component<IRoutesProps> {
     return (
       <Switch>
         <Route exact={true} path="/" render={this.rootNamespacedRedirect} />
-        {Object.keys(routes).map(route => (
-          <Route key={route} exact={true} path={route} component={routes[route]} />
+        {Object.entries(routes).map(([route, component]) => (
+          <Route key={route} exact={true} path={route} component={component} />
         ))}
-        {Object.keys(privateRoutes).map(route => (
-          <PrivateRouteContainer
-            key={route}
-            exact={true}
-            path={route}
-            component={privateRoutes[route]}
-          />
+        {Object.entries(privateRoutes).map(([route, component]) => (
+          <PrivateRouteContainer key={route} exact={true} path={route} component={component} />
         ))}
         {/* If the route doesn't match any expected path redirect to a 404 page  */}
         <Route component={NotFound} />