diff --git a/packages/frontend-app-api/src/wiring/discovery.ts b/packages/frontend-app-api/src/wiring/discovery.ts
index 4e50290350..f80bf47aa8 100644
--- a/packages/frontend-app-api/src/wiring/discovery.ts
+++ b/packages/frontend-app-api/src/wiring/discovery.ts
@@ -84,6 +84,10 @@ export function getAvailableFeatures(config: Config): FrontendFeature[] {
 function isBackstageFeature(obj: unknown): obj is FrontendFeature {
   if (obj !== null && typeof obj === 'object' && '$$type' in obj) {
     return (
+      obj.$$type === '@backstage/FrontendPlugin' ||
+      obj.$$type === '@backstage/FrontendModule' ||
+      // TODO: Remove this once the old plugin type and extension overrides
+      // are no longer supported
       obj.$$type === '@backstage/BackstagePlugin' ||
       obj.$$type === '@backstage/ExtensionOverrides'
     );