diff --git a/packages/core/src/api/app/AppBuilder.tsx b/packages/core/src/api/app/AppBuilder.tsx
index 95537d5101..c8a56876c9 100644
--- a/packages/core/src/api/app/AppBuilder.tsx
+++ b/packages/core/src/api/app/AppBuilder.tsx
@@ -90,7 +90,10 @@ export default class AppBuilder {
             break;
           }
           case 'feature-flag': {
-            registeredFeatureFlags.push({ name: output.name });
+            registeredFeatureFlags.push({
+              pluginId: plugin.config.id,
+              name: output.name,
+            });
             break;
           }
           default:
diff --git a/packages/core/src/api/app/FeatureFlags.tsx b/packages/core/src/api/app/FeatureFlags.tsx
index ff3ff10481..708f4f50fc 100644
--- a/packages/core/src/api/app/FeatureFlags.tsx
+++ b/packages/core/src/api/app/FeatureFlags.tsx
@@ -71,6 +71,7 @@ export const FeatureFlags = new FeatureFlagsImpl();
  * Backstage components. This enables viewing all of the available flags.
  */
 export interface FeatureFlagsEntry {
+  pluginId: string;
   name: FeatureFlagName;
 }