diff --git a/webapp/packages/core-connections/src/ConnectionInfoResource.ts b/webapp/packages/core-connections/src/ConnectionInfoResource.ts
index 6b21cc7cf9..558e286318 100644
--- a/webapp/packages/core-connections/src/ConnectionInfoResource.ts
+++ b/webapp/packages/core-connections/src/ConnectionInfoResource.ts
@@ -97,7 +97,7 @@ export class ConnectionInfoResource extends CachedMapResource<IConnectionInfoPar
     this.onConnectionCreate.addHandler(ExecutorInterrupter.interrupter(() => this.sessionUpdate));
 
     permissionsResource.require(this, EPermission.public);
-    this.sync(this.projectInfoResource, () => CachedMapAllKey);
+    this.sync(this.projectInfoResource, () => CachedMapAllKey, () => CachedMapAllKey);
 
     sessionDataResource.onDataOutdated.addHandler(() => {
       this.sessionUpdate = true;
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/NavTreeResource.ts b/webapp/packages/core-navigation-tree/src/NodesManager/NavTreeResource.ts
index 51f969ad07..be2eaec544 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/NavTreeResource.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/NavTreeResource.ts
@@ -111,7 +111,7 @@ export class NavTreeResource extends CachedMapResource<string, string[]> {
     // navNodeInfoResource.preloadResource(this);
     this.outdateResource(navNodeInfoResource);
     this.updateResource(navNodeInfoResource);
-    this.sync(this.projectInfoResource, () => CachedMapAllKey);
+    this.sync(this.projectInfoResource, () => CachedMapAllKey, () => CachedMapAllKey);
     this.sessionDataResource.outdateResource(this);
     this.userInfoResource.onUserChange.addHandler(action(() => {
       this.clear();
diff --git a/webapp/packages/core-projects/src/ProjectsService.ts b/webapp/packages/core-projects/src/ProjectsService.ts
index a65dbd8121..03a4921feb 100644
--- a/webapp/packages/core-projects/src/ProjectsService.ts
+++ b/webapp/packages/core-projects/src/ProjectsService.ts
@@ -64,7 +64,7 @@ export class ProjectsService {
   get defaultProject(): ProjectInfo | undefined {
     let project = this.userProject;
 
-    if (!project && this.activeProjects.length > 0) {
+    if ((!project || this.activeProjectIds.length > 0) && this.activeProjects.length > 0) {
       project = this.activeProjects[0];
     }