diff --git a/.changeset/sour-plums-enjoy.md b/.changeset/sour-plums-enjoy.md
new file mode 100644
index 0000000000..ef68166255
--- /dev/null
+++ b/.changeset/sour-plums-enjoy.md
@@ -0,0 +1,7 @@
+---
+'@backstage/create-app': patch
+---
+
+Fix system diagram card to be on the system page
+
+To apply the same fix to an existing application, in `EntityPage.tsx` simply move the `<EntityLayout.route>` for the `/diagram` path from the `groupPage` down into the `systemPage` element.