diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/DBObjectResource.ts b/webapp/packages/core-navigation-tree/src/NodesManager/DBObjectResource.ts
index 98a8ca16a4..f3d5a3e045 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/DBObjectResource.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/DBObjectResource.ts
@@ -35,6 +35,15 @@ export class DBObjectResource extends CachedMapResource<string, DBObject> {
     // this.preloadResource(this.navNodeInfoResource);
     this.navNodeInfoResource.outdateResource(this);
     this.navNodeInfoResource.deleteInResource(this);
+
+    this.navTreeResource.onDataUpdate.addHandler(key => {
+      ResourceKeyUtils.forEach(key, nodeId => {
+        if (!isResourceAlias(nodeId)) {
+          this.markOutdated(DBObjectParentKey(nodeId));
+        }
+      });
+    });
+
     this.beforeLoad.addHandler(async (originalKey, context) => {
       await this.navTreeResource.waitLoad();
       if (this.isAlias(originalKey, DBObjectParentKey)) {
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Table.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Table.tsx
index de95c0b0e6..a3dc0deeda 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Table.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/Table/Table.tsx
@@ -103,7 +103,7 @@ export const Table = observer<Props>(function Table({
     .sort((a, b) => (b.object?.properties?.length || 0) - (a.object?.properties?.length || 0));
 
   const nodeIds = objects.map(object => object.id);
-  const properties = baseObject[0].object?.properties ?? [];
+  const properties = baseObject[0]?.object?.properties ?? [];
   const measuredCells = getMeasuredCells(properties, objects);
 
   const dataColumns: IDataColumn[] = properties.map((property, index) => ({