diff --git a/plugins/catalog-react/src/hooks/useEntity.tsx b/plugins/catalog-react/src/hooks/useEntity.tsx
index 1f438f19a0..bcb38bb807 100644
--- a/plugins/catalog-react/src/hooks/useEntity.tsx
+++ b/plugins/catalog-react/src/hooks/useEntity.tsx
@@ -169,7 +169,15 @@ export function useEntity<T extends Entity = Entity>() {
     useVersionedContext<{ 1: EntityLoadingStatus }>('entity-context');
 
   if (!versionedHolder) {
-    throw new Error('Entity context is not available');
+    // TODO(Rugvip): Throw this once we fully migrate to the new context
+    // throw new Error('Entity context is not available');
+
+    return {
+      entity: undefined as unknown as T,
+      loading: true,
+      error: undefined,
+      refresh: () => {},
+    };
   }
 
   const value = versionedHolder.atVersion(1);