diff --git a/packages/frontend-plugin-api/src/analytics/AnalyticsContext.tsx b/packages/frontend-plugin-api/src/analytics/AnalyticsContext.tsx
index 10ef475803..2c022ad8e9 100644
--- a/packages/frontend-plugin-api/src/analytics/AnalyticsContext.tsx
+++ b/packages/frontend-plugin-api/src/analytics/AnalyticsContext.tsx
@@ -37,7 +37,7 @@ export const useAnalyticsContext = (): AnalyticsContextValue => {
   // Provide a default value if no value exists.
   if (theContext === undefined) {
     return {
-      pluginId: 'root',
+      pluginId: 'app',
       extensionId: 'App',
     };
   }
diff --git a/packages/frontend-plugin-api/src/analytics/types.ts b/packages/frontend-plugin-api/src/analytics/types.ts
index 21347e2fc7..3e3a9ad5eb 100644
--- a/packages/frontend-plugin-api/src/analytics/types.ts
+++ b/packages/frontend-plugin-api/src/analytics/types.ts
@@ -25,9 +25,6 @@ export type CommonAnalyticsContext = {
    */
   pluginId: string;
 
-  /**
-   * The nearest known parent extension where the event was captured.
-   */
   /**
    * The nearest known parent extension where the event was captured.
    */
diff --git a/packages/frontend-plugin-api/src/components/ExtensionBoundary.tsx b/packages/frontend-plugin-api/src/components/ExtensionBoundary.tsx
index 9a8eb5b750..768352b76e 100644
--- a/packages/frontend-plugin-api/src/components/ExtensionBoundary.tsx
+++ b/packages/frontend-plugin-api/src/components/ExtensionBoundary.tsx
@@ -65,7 +65,7 @@ export function ExtensionBoundary(props: ExtensionBoundaryProps) {
   // Skipping "routeRef" attribute in the new system, the extension "id" should provide more insight
   const attributes = {
     extensionId: node.spec.id,
-    pluginId: node.spec.source?.id,
+    pluginId: node.spec.source?.id ?? 'app',
   };
 
   return (