diff --git a/packages/create-app/templates/default-app/packages/app/src/App.tsx b/packages/create-app/templates/default-app/packages/app/src/App.tsx
index 9b431ca441..f002bbc7c7 100644
--- a/packages/create-app/templates/default-app/packages/app/src/App.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/App.tsx
@@ -8,7 +8,9 @@ import {
 import { apis } from './apis';
 import * as plugins from './plugins';
 import { AppSidebar } from './sidebar';
-import { AppRoutes } from './components/AppRoutes';
+import { Route, Routes, Navigate } from 'react-router';
+import { Router as CatalogRouter } from '@backstage/plugin-catalog';
+import { EntityPage } from './components/catalog/EntityPage';
 
 const app = createApp({
   apis,
@@ -17,6 +19,7 @@ const app = createApp({
 
 const AppProvider = app.getProvider();
 const AppRouter = app.getRouter();
+const deprecatedAppRoutes = app.getRoutes();
 
 const App: FC<{}> = () => (
   <AppProvider>
@@ -25,7 +28,14 @@ const App: FC<{}> = () => (
     <AppRouter>
       <SidebarPage>
         <AppSidebar />
-        <AppRoutes />
+        <Routes>
+          <Route
+            path="/catalog/*"
+            element={<CatalogRouter EntityPage={EntityPage} />}
+          />
+          <Navigate key="/" to="/catalog" />
+          {deprecatedAppRoutes}
+        </Routes>
       </SidebarPage>
     </AppRouter>
   </AppProvider>
diff --git a/packages/create-app/templates/default-app/packages/app/src/components/AppRoutes.tsx b/packages/create-app/templates/default-app/packages/app/src/components/AppRoutes.tsx
deleted file mode 100644
index b689052a4a..0000000000
--- a/packages/create-app/templates/default-app/packages/app/src/components/AppRoutes.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-import { Routes, Route, Navigate } from 'react-router';
-import { CatalogRouter } from '@backstage/plugin-catalog';
-import { EntityPage } from './catalog/EntityPage';
-
-export const AppRoutes = () => (
-  <Routes>
-    <Route
-      path="/catalog/*"
-      element={<CatalogRouter EntityPage={EntityPage} />}
-    />
-    <Route path="/" element={<Navigate to="/catalog" />} />
-  </Routes>
-);