diff --git a/packages/geo/src/lib/catalog/catalog-browser/catalog-browser.component.ts b/packages/geo/src/lib/catalog/catalog-browser/catalog-browser.component.ts
index f4d6280c9a..e40e32dde8 100644
--- a/packages/geo/src/lib/catalog/catalog-browser/catalog-browser.component.ts
+++ b/packages/geo/src/lib/catalog/catalog-browser/catalog-browser.component.ts
@@ -100,7 +100,9 @@ export class CatalogBrowserComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy() {
-    this.watcher.destroy();
+    if (this.watcher) {
+      this.watcher.destroy();
+    }
   }
 
   /**