diff --git a/packages/core-api/src/app/types.ts b/packages/core-api/src/app/types.ts
index 40e9913201..333eb06afd 100644
--- a/packages/core-api/src/app/types.ts
+++ b/packages/core-api/src/app/types.ts
@@ -61,7 +61,7 @@ export type AppComponents = {
   Router: ComponentType<{}>;
   ErrorBoundaryFallback: ComponentType<
     ErrorBoundaryFallbackProps & {
-      plugin: BackstagePlugin;
+      plugin?: BackstagePlugin;
     }
   >;
 
diff --git a/packages/core-api/src/extensions/extensions.test.tsx b/packages/core-api/src/extensions/extensions.test.tsx
index db67ed18c9..773dc32ab2 100644
--- a/packages/core-api/src/extensions/extensions.test.tsx
+++ b/packages/core-api/src/extensions/extensions.test.tsx
@@ -99,7 +99,7 @@ describe('extensions', () => {
     const apis = ApiRegistry.from([[errorApiRef, errorApi]]);
 
     const MockFallback: AppComponents['ErrorBoundaryFallback'] = props => (
-      <>Error in {props.plugin.getId()}</>
+      <>Error in {props.plugin?.getId()}</>
     );
 
     const { error: errors } = await withLogCollector(['error'], async () => {
diff --git a/packages/core/src/components/ErrorBoundaryFallback/ErrorBoundaryFallback.tsx b/packages/core/src/components/ErrorBoundaryFallback/ErrorBoundaryFallback.tsx
index f1364061df..0fe7d11c1f 100644
--- a/packages/core/src/components/ErrorBoundaryFallback/ErrorBoundaryFallback.tsx
+++ b/packages/core/src/components/ErrorBoundaryFallback/ErrorBoundaryFallback.tsx
@@ -28,7 +28,7 @@ export const ErrorBoundaryFallback: AppComponents['ErrorBoundaryFallback'] = ({
 }) => {
   return (
     <ResponseErrorPanel
-      title={`Error in ${plugin.getId()}`}
+      title={`Error in ${plugin?.getId()}`}
       defaultExpanded
       error={error}
       actions={