diff --git a/packages/geo/src/lib/search/search-bar/search-bar.component.ts b/packages/geo/src/lib/search/search-bar/search-bar.component.ts
index 34b6cbe4ba..9fa56fad51 100644
--- a/packages/geo/src/lib/search/search-bar/search-bar.component.ts
+++ b/packages/geo/src/lib/search/search-bar/search-bar.component.ts
@@ -370,7 +370,7 @@ export class SearchBarComponent implements OnInit, OnDestroy {
     this.search.emit({ research, results });
 
     if (this.store !== undefined) {
-      const newResults = this.store.entities$.value
+      const newResults = this.store.all()
         .filter(result => result.source !== research.source)
         .concat(results);
       this.store.load(newResults);
diff --git a/packages/integration/src/lib/catalog/catalog-library-tool/catalog-library-tool.component.ts b/packages/integration/src/lib/catalog/catalog-library-tool/catalog-library-tool.component.ts
index 4d6dfe5803..e210794364 100644
--- a/packages/integration/src/lib/catalog/catalog-library-tool/catalog-library-tool.component.ts
+++ b/packages/integration/src/lib/catalog/catalog-library-tool/catalog-library-tool.component.ts
@@ -40,7 +40,7 @@ export class CatalogLibraryToolComponent implements OnInit {
    * @internal
    */
   ngOnInit() {
-    if (this.store.entities$.value.length === 0) {
+    if (this.store.count === 0) {
       this.loadCatalogs();
     }
   }