diff --git a/plugins/catalog/src/components/Router.tsx b/plugins/catalog/src/components/Router.tsx
index fe1ba3a593..298aa28d52 100644
--- a/plugins/catalog/src/components/Router.tsx
+++ b/plugins/catalog/src/components/Router.tsx
@@ -50,7 +50,7 @@ const EntityPageSwitch = ({ EntityPage }: { EntityPage: ComponentType }) => {
   const { entity, loading, error } = useEntity();
   // Loading and error states
   if (loading) return <EntityPageLayout />;
-  if (error || (!loading && !entity)) return <EntityNotFound />;
+  if (error || !entity) return <EntityNotFound />;
 
   // Otherwise EntityPage provided from the App
   // Note that EntityPage will include EntityPageLayout already