diff --git a/src/features/connectivity/connectivityBrowser/connectivityBrowser.component.ts b/src/features/connectivity/connectivityBrowser/connectivityBrowser.component.ts
index c83974a1a3cfffe8c5b00a5d830eb48529fca3b7..f4a2c8e6231db8386047195264206516136d8577 100644
--- a/src/features/connectivity/connectivityBrowser/connectivityBrowser.component.ts
+++ b/src/features/connectivity/connectivityBrowser/connectivityBrowser.component.ts
@@ -156,13 +156,15 @@ export class ConnectivityBrowserComponent implements OnChanges, OnDestroy {
        * on
        * - accordion update
        * - colormap change
-       * - fetching matrix
+       * - fetching matrix flag is true
        * remove custom layer
        */
       merge(
         this.#accordionExpanded$,
         this.colormap$,
-        this.#fetchingMatrix$,
+        this.#fetchingMatrix$.pipe(
+          filter(flag => !!flag)
+        ),
       ).subscribe(() => {
         this.removeCustomLayer()
       }),