diff --git a/packages/app-next/app-config.yaml b/packages/app-next/app-config.yaml
index 0c75e1c96c..a46e119ac0 100644
--- a/packages/app-next/app-config.yaml
+++ b/packages/app-next/app-config.yaml
@@ -10,10 +10,15 @@ app:
     - apis.plugin.graphiql.browse.gitlab: true
 
     # Entity page cards
-    - 'entity.cards.about'
+    - entity.cards.about
+    - entity.cards.labels
+    - entity.cards.links:
+        config:
+          filter:
+            - isKind: component
 
     # Entity page content
-    - 'entity.content.techdocs'
+    - entity.content.techdocs
 
   # scmAuthExtension: >-
   #   createScmAuthExtension({
diff --git a/plugins/catalog/src/alpha/entityCards.tsx b/plugins/catalog/src/alpha/entityCards.tsx
index cc30928fcf..c7b75679a7 100644
--- a/plugins/catalog/src/alpha/entityCards.tsx
+++ b/plugins/catalog/src/alpha/entityCards.tsx
@@ -27,6 +27,7 @@ export const EntityAboutCard = createEntityCardExtension({
 
 export const EntityLinksCard = createEntityCardExtension({
   id: 'links',
+  filter: ({ entity }) => Boolean(entity.metadata.links),
   loader: async () =>
     import('../components/EntityLinksCard').then(m => {
       return <m.EntityLinksCard variant="gridItem" />;
@@ -35,6 +36,7 @@ export const EntityLinksCard = createEntityCardExtension({
 
 export const EntityLabelsCard = createEntityCardExtension({
   id: 'labels',
+  filter: ({ entity }) => Boolean(entity.metadata.labels),
   loader: async () =>
     import('../components/EntityLabelsCard').then(m => (
       <m.EntityLabelsCard variant="gridItem" />