diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index 2958a3399b..40ed04b30c 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -465,7 +465,12 @@ const SystemEntityPage = ({ entity }: { entity: Entity }) => (
       path="/docs/*"
       title="Docs"
       element={<DocsRouter entity={entity} />}
-      />
+    />
+    <EntityPageLayout.Content
+      path="/diagram/*"
+      title="Diagram"
+      element={<SystemDiagram entity={entity} />}
+    />
   </EntityPageLayout>
 );
 
@@ -492,11 +497,6 @@ const DomainEntityPage = ({ entity }: { entity: Entity }) => (
       title="Docs"
       element={<DocsRouter entity={entity} />}
     />
-    <EntityPageLayout.Content
-      path="/diagram/*"
-      title="Diagram"
-      element={<SystemDiagram entity={entity} />}
-    />
   </EntityPageLayout>
 );