diff --git a/webapp/packages/core-connections/src/ContainerResource.ts b/webapp/packages/core-connections/src/ContainerResource.ts
index eb632a61bf..89598cb36e 100644
--- a/webapp/packages/core-connections/src/ContainerResource.ts
+++ b/webapp/packages/core-connections/src/ContainerResource.ts
@@ -17,6 +17,7 @@ import {
   resourceKeyList,
   ResourceKeyUtils,
 } from '@cloudbeaver/core-sdk';
+import { isNull } from '@cloudbeaver/core-utils';
 
 import { ConnectionInfoActiveProjectKey, ConnectionInfoResource } from './ConnectionInfoResource';
 import type { IConnectionInfoParams } from './IConnectionsResource';
@@ -124,7 +125,7 @@ export class ContainerResource extends CachedMapResource<ObjectContainerParams,
       typeof key === 'object' &&
       typeof key.projectId === 'string' &&
       ['string'].includes(typeof key.connectionId) &&
-      ['string', 'undefined'].includes(typeof key.catalogId)
+      (['string', 'undefined'].includes(typeof key.catalogId) || isNull(key.catalogId))
     );
   }
 }
diff --git a/webapp/packages/core-utils/src/TempMap.ts b/webapp/packages/core-utils/src/TempMap.ts
index 4b9a789da7..68c0405145 100644
--- a/webapp/packages/core-utils/src/TempMap.ts
+++ b/webapp/packages/core-utils/src/TempMap.ts
@@ -43,8 +43,9 @@ export class TempMap<TKey, TValue> implements Map<TKey, TValue> {
     this.entriesTemp = cacheValue();
     this.valuesTemp = cacheValue();
 
-    makeObservable<this, 'deleted'>(this, {
+    makeObservable<this, 'deleted' | 'scheduleFlush'>(this, {
       deleted: observable.shallow,
+      scheduleFlush: action,
     });
   }