diff --git a/plugins/catalog/src/components/RelatedEntitiesCard/RelatedEntitiesCard.tsx b/plugins/catalog/src/components/RelatedEntitiesCard/RelatedEntitiesCard.tsx
index c9bf3a3c19..a01b7c8c8b 100644
--- a/plugins/catalog/src/components/RelatedEntitiesCard/RelatedEntitiesCard.tsx
+++ b/plugins/catalog/src/components/RelatedEntitiesCard/RelatedEntitiesCard.tsx
@@ -16,12 +16,11 @@
 
 import { Entity } from '@backstage/catalog-model';
 import {
-  CodeSnippet,
   InfoCard,
   Link,
   Progress,
+  ResponseErrorPanel,
   TableColumn,
-  WarningPanel,
 } from '@backstage/core';
 import { Typography } from '@material-ui/core';
 import {
@@ -39,7 +38,7 @@ type Props<T extends Entity> = {
   relationType: string;
   emptyMessage: string;
   emptyHelpLink: string;
-  asRenderableEntities: (entities: Entity[]) => T[];
+  asRenderableEntities: (entities: Entity[] | undefined) => T[];
 };
 
 export function RelatedEntitiesCard<T extends Entity>({
@@ -66,14 +65,10 @@ export function RelatedEntitiesCard<T extends Entity>({
     );
   }
 
-  if (error || !entities) {
+  if (error) {
     return (
       <InfoCard variant={variant} title={title}>
-        <WarningPanel
-          severity="error"
-          title={`Could not load ${title}`}
-          message={<CodeSnippet text={`${error}`} language="text" />}
-        />
+        <ResponseErrorPanel error={error} />
       </InfoCard>
     );
   }
diff --git a/plugins/catalog/src/components/RelatedEntitiesCard/presets.ts b/plugins/catalog/src/components/RelatedEntitiesCard/presets.ts
index 9d3586a7e9..90a916e902 100644
--- a/plugins/catalog/src/components/RelatedEntitiesCard/presets.ts
+++ b/plugins/catalog/src/components/RelatedEntitiesCard/presets.ts
@@ -31,8 +31,9 @@ export const componentEntityColumns: TableColumn<ComponentEntity>[] = [
 ];
 export const componentEntityHelpLink: string =
   'https://backstage.io/docs/features/software-catalog/descriptor-format#kind-component';
-export const asComponentEntities = (entities: Entity[]): ComponentEntity[] =>
-  entities as ComponentEntity[];
+export const asComponentEntities = (
+  entities: Entity[] | undefined,
+): ComponentEntity[] => entities as ComponentEntity[];
 
 export const resourceEntityColumns: TableColumn<ResourceEntity>[] = [
   EntityTable.columns.createEntityRefColumn({ defaultKind: 'resource' }),
@@ -43,8 +44,9 @@ export const resourceEntityColumns: TableColumn<ResourceEntity>[] = [
 ];
 export const resourceEntityHelpLink: string =
   'https://backstage.io/docs/features/software-catalog/descriptor-format#kind-resource';
-export const asResourceEntities = (entities: Entity[]): ResourceEntity[] =>
-  entities as ResourceEntity[];
+export const asResourceEntities = (
+  entities: Entity[] | undefined,
+): ResourceEntity[] => entities as ResourceEntity[];
 
 export const systemEntityColumns: TableColumn<SystemEntity>[] = [
   EntityTable.columns.createEntityRefColumn({ defaultKind: 'system' }),
@@ -53,5 +55,6 @@ export const systemEntityColumns: TableColumn<SystemEntity>[] = [
 ];
 export const systemEntityHelpLink: string =
   'https://backstage.io/docs/features/software-catalog/descriptor-format#kind-system';
-export const asSystemEntities = (entities: Entity[]): SystemEntity[] =>
-  entities as SystemEntity[];
+export const asSystemEntities = (
+  entities: Entity[] | undefined,
+): SystemEntity[] => entities as SystemEntity[];