diff --git a/.changeset/big-taxis-cough.md b/.changeset/big-taxis-cough.md
new file mode 100644
index 000000000..ff4107895
--- /dev/null
+++ b/.changeset/big-taxis-cough.md
@@ -0,0 +1,5 @@
+---
+'@roadiehq/backstage-plugin-datadog': patch
+---
+
+Update default filtering to be based on required annotation for the new frontend system components
diff --git a/plugins/frontend/backstage-plugin-datadog/README.md b/plugins/frontend/backstage-plugin-datadog/README.md
index 31ce5cd25..2087eb4e0 100644
--- a/plugins/frontend/backstage-plugin-datadog/README.md
+++ b/plugins/frontend/backstage-plugin-datadog/README.md
@@ -82,17 +82,6 @@ export const app = createApp({
 });
 ```
 
-2.  Next, enable your desired extensions in `app-config.yaml`. By default, the content and cards will only appear on entities that are components or resources. You can override that behavior by adding a config block, demonstrated on the 'datadog-graph' card.
-
-```yaml
-app:
-  extensions:
-    - entity-content:datadog/entity
-    - entity-card:datadog/datadog-graph:
-        config:
-          filter: kind:component,api,resource
-```
-
 ## Specify datadog domain
 
 Datadog embedded graph is using `datadoghq.eu`as default top-level domain, when other is not specified. If you are using other domain, you need to specify it with corresponding annotations `datadoghq.com/site`.
diff --git a/plugins/frontend/backstage-plugin-datadog/src/alpha/entityCards.tsx b/plugins/frontend/backstage-plugin-datadog/src/alpha/entityCards.tsx
index d67b7c59c..3ff17516a 100644
--- a/plugins/frontend/backstage-plugin-datadog/src/alpha/entityCards.tsx
+++ b/plugins/frontend/backstage-plugin-datadog/src/alpha/entityCards.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { EntityCardBlueprint } from '@backstage/plugin-catalog-react/alpha';
+import { isDatadogGraphAvailable } from '../plugin';
 
 /**
  * @alpha
@@ -7,7 +8,7 @@ import { EntityCardBlueprint } from '@backstage/plugin-catalog-react/alpha';
 export const entityDatadogGraphCard = EntityCardBlueprint.make({
   name: 'datadog-graph',
   params: {
-    filter: 'kind:component,resource',
+    filter: isDatadogGraphAvailable,
     loader: () =>
       import('../components/GraphWidget').then(m => <m.GraphWidget />),
   },
diff --git a/plugins/frontend/backstage-plugin-datadog/src/alpha/entityContent.tsx b/plugins/frontend/backstage-plugin-datadog/src/alpha/entityContent.tsx
index 3a888f89e..ac01f561d 100644
--- a/plugins/frontend/backstage-plugin-datadog/src/alpha/entityContent.tsx
+++ b/plugins/frontend/backstage-plugin-datadog/src/alpha/entityContent.tsx
@@ -3,7 +3,7 @@ import {
   convertLegacyRouteRef,
 } from '@backstage/core-compat-api';
 import { EntityContentBlueprint } from '@backstage/plugin-catalog-react/alpha';
-import { entityContentRouteRef } from '../plugin';
+import { entityContentRouteRef, isDatadogDashboardAvailable } from '../plugin';
 import React from 'react';
 
 /**
@@ -14,7 +14,7 @@ export const entityDatadogContent = EntityContentBlueprint.make({
   params: {
     defaultPath: '/datadog',
     defaultTitle: 'Datadog',
-    filter: 'kind:component,resource',
+    filter: isDatadogDashboardAvailable,
     routeRef: convertLegacyRouteRef(entityContentRouteRef),
     loader: () => import('../Router').then(m => compatWrapper(<m.Router />)),
   },