diff --git a/plugins/pagerduty/src/api/client.ts b/plugins/pagerduty/src/api/client.ts
index 6c31f2a5d0..8ab0bcdc31 100644
--- a/plugins/pagerduty/src/api/client.ts
+++ b/plugins/pagerduty/src/api/client.ts
@@ -32,9 +32,9 @@ import {
   ConfigApi,
   FetchApi,
 } from '@backstage/core-plugin-api';
+import { NotFoundError } from '@backstage/errors';
 
 export class UnauthorizedError extends Error {}
-export class NotFoundError extends Error {}
 
 export const pagerDutyApiRef = createApiRef<PagerDutyApi>({
   id: 'plugin.pagerduty.api',
diff --git a/plugins/pagerduty/src/api/index.ts b/plugins/pagerduty/src/api/index.ts
index e23ee0c9a4..015204b1e8 100644
--- a/plugins/pagerduty/src/api/index.ts
+++ b/plugins/pagerduty/src/api/index.ts
@@ -14,10 +14,5 @@
  * limitations under the License.
  */
 
-export {
-  PagerDutyClient,
-  pagerDutyApiRef,
-  UnauthorizedError,
-  NotFoundError,
-} from './client';
+export { PagerDutyClient, pagerDutyApiRef, UnauthorizedError } from './client';
 export type { PagerDutyApi } from './types';
diff --git a/plugins/pagerduty/src/components/PagerDutyCard/index.test.tsx b/plugins/pagerduty/src/components/PagerDutyCard/index.test.tsx
index 54b58489be..041f76fb8c 100644
--- a/plugins/pagerduty/src/components/PagerDutyCard/index.test.tsx
+++ b/plugins/pagerduty/src/components/PagerDutyCard/index.test.tsx
@@ -18,11 +18,11 @@ import { render, waitFor, fireEvent, act } from '@testing-library/react';
 import { PagerDutyCard, isPluginApplicableToEntity } from '../PagerDutyCard';
 import { Entity } from '@backstage/catalog-model';
 import { EntityProvider } from '@backstage/plugin-catalog-react';
+import { NotFoundError } from '@backstage/errors';
 import { TestApiRegistry, wrapInTestApp } from '@backstage/test-utils';
 import {
   pagerDutyApiRef,
   UnauthorizedError,
-  NotFoundError,
   PagerDutyClient,
 } from '../../api';
 import { Service, User } from '../types';
diff --git a/plugins/pagerduty/src/components/PagerDutyCard/index.tsx b/plugins/pagerduty/src/components/PagerDutyCard/index.tsx
index 308d17a08d..48a7f69e3c 100644
--- a/plugins/pagerduty/src/components/PagerDutyCard/index.tsx
+++ b/plugins/pagerduty/src/components/PagerDutyCard/index.tsx
@@ -20,7 +20,7 @@ import { Incidents } from '../Incident';
 import { EscalationPolicy } from '../Escalation';
 import useAsync from 'react-use/lib/useAsync';
 import { Alert } from '@material-ui/lab';
-import { pagerDutyApiRef, UnauthorizedError, NotFoundError } from '../../api';
+import { pagerDutyApiRef, UnauthorizedError } from '../../api';
 import AlarmAddIcon from '@material-ui/icons/AlarmAdd';
 import { MissingTokenError, ServiceNotFoundError } from '../Errors';
 import WebIcon from '@material-ui/icons/Web';
@@ -32,6 +32,7 @@ import { ChangeEvents } from '../ChangeEvents';
 import { Service } from '../types';
 
 import { useApi } from '@backstage/core-plugin-api';
+import { NotFoundError } from '@backstage/errors';
 import {
   Progress,
   HeaderIconLinkRow,