diff --git a/webapp/packages/core/src/app/shared/NodesManager/DBObjectService.ts b/webapp/packages/core/src/app/shared/NodesManager/DBObjectService.ts
index 96cd3d1e0e..856af34b88 100644
--- a/webapp/packages/core/src/app/shared/NodesManager/DBObjectService.ts
+++ b/webapp/packages/core/src/app/shared/NodesManager/DBObjectService.ts
@@ -15,6 +15,13 @@ import { DBObject } from './EntityTypes';
 export interface IDBObjectParams {
   navNodeId: string[];
   remove?: boolean;
+  parentId?: never;
+}
+
+export interface IDBObjectValueParams {
+  parentId: string;
+  navNodeId: string[];
+  remove?: never;
 }
 
 interface IDBObjectMetadata {
@@ -39,9 +46,12 @@ export class DBObjectService {
   }
 
   async load(navNodeId: string): Promise< DBObject>
-  async load(navNodeId: string[]): Promise<DBObject[]>
-  async load(navNodeId: string | string[]): Promise<DBObject | DBObject[]> {
-    const dbObject = await this.dbObject.load({ navNodeId: Array.isArray(navNodeId) ? navNodeId : [navNodeId] });
+  async load(navNodeId: string[], parentId?: string): Promise<DBObject[]>
+  async load(navNodeId: string | string[], parentId?: string): Promise<DBObject | DBObject[]> {
+    const dbObject = await this.dbObject.load({
+      navNodeId: Array.isArray(navNodeId) ? navNodeId : [navNodeId],
+      parentId,
+    });
 
     if (!Array.isArray(navNodeId)) {
       return dbObject.get(navNodeId)!;
@@ -57,8 +67,44 @@ export class DBObjectService {
     dbObject: Map<string, DBObject>,
     metadata: MetadataMap<string, IDBObjectMetadata>,
     load: boolean,
-    data: IDBObjectParams
+    data: IDBObjectParams | IDBObjectValueParams
   ) {
+
+    if (data.parentId) {
+      for (const navNodeId of data.navNodeId) {
+        const itemMetadata = metadata.get(navNodeId);
+        itemMetadata.loaded = false;
+        if (load) {
+          itemMetadata.loading = true;
+        }
+      }
+
+      if (load) {
+        try {
+          const { dbObjects } = await this.graphQLService.gql.getChildrenDBObjectInfo({
+            navNodeId: data.parentId,
+          });
+
+          for (const navNodeId of data.navNodeId) {
+            const data = dbObjects.find(dbObject => dbObject.id === navNodeId);
+
+            if (data) {
+              const itemMetadata = metadata.get(navNodeId);
+              dbObject.set(navNodeId, { navNodeId, ...data.object } as DBObject);
+              itemMetadata.loaded = true;
+            }
+          }
+        } finally {
+          for (const navNodeId of data.navNodeId) {
+            const itemMetadata = metadata.get(navNodeId);
+            itemMetadata.loading = false;
+          }
+        }
+      }
+
+      return dbObject;
+    }
+
     for (const navNodeId of data.navNodeId) {
       if (data.remove) {
         dbObject.delete(navNodeId);
diff --git a/webapp/packages/core/src/app/shared/NodesManager/NavNodeManagerService.ts b/webapp/packages/core/src/app/shared/NodesManager/NavNodeManagerService.ts
index f94115a74f..fe44cb2ccc 100644
--- a/webapp/packages/core/src/app/shared/NodesManager/NavNodeManagerService.ts
+++ b/webapp/packages/core/src/app/shared/NodesManager/NavNodeManagerService.ts
@@ -423,7 +423,9 @@ export class NavNodeManagerService {
       }
     }
 
-    await this.dbObjectService.dbObject.refresh(false, { navNodeId: nodesId });
+    if (load) {
+      await this.dbObjectService.dbObject.refresh(false, { navNodeId: nodesId });
+    }
 
     return navNode;
   }
diff --git a/webapp/packages/object-viewer-plugin/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTable.tsx b/webapp/packages/object-viewer-plugin/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTable.tsx
index 823622753d..bec1c21cf2 100644
--- a/webapp/packages/object-viewer-plugin/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTable.tsx
+++ b/webapp/packages/object-viewer-plugin/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTable.tsx
@@ -31,7 +31,7 @@ export const ObjectPropertyTable = observer(function ObjectPropertyTable({
   parentId,
 }: ObjectPropertyTableProps) {
   const children = useChildren(objectId);
-  const { isLoading } = useObjectFolder(parentId);
+  const { isLoading } = useObjectFolder(objectId);
 
   if (!children.children || children.isLoading || isLoading) {
     return <Loader />;
diff --git a/webapp/packages/object-viewer-plugin/src/ObjectViewerTabService.ts b/webapp/packages/object-viewer-plugin/src/ObjectViewerTabService.ts
index 8f7bb67dcc..7efec3e47a 100644
--- a/webapp/packages/object-viewer-plugin/src/ObjectViewerTabService.ts
+++ b/webapp/packages/object-viewer-plugin/src/ObjectViewerTabService.ts
@@ -204,7 +204,7 @@ export class ObjectViewerTabService {
       }
       const folderChildren = await this.navNodeManagerService.loadTree(folderId);
 
-      await this.dbObjectService.load(folderChildren);
+      await this.dbObjectService.load(folderChildren, folderId);
     } catch (exception) {
       this.notificationService.logException(exception, 'Error in Object Viewer while tab selecting');
     }