diff --git a/packages/datalib/src/PerspectiveTreeNode.ts b/packages/datalib/src/PerspectiveTreeNode.ts
index 63698450c..e94951d89 100644
--- a/packages/datalib/src/PerspectiveTreeNode.ts
+++ b/packages/datalib/src/PerspectiveTreeNode.ts
@@ -236,6 +236,8 @@ export abstract class PerspectiveTreeNode {
       const nodeConfig: PerspectiveNodeConfig = {
         ...createPerspectiveNodeConfig(this.namedObject),
         isAutoGenerated: true,
+        conid: this.parentNodeConfig?.conid,
+        database: this.parentNodeConfig?.database,
       };
       const refConfig: PerspectiveReferenceConfig = {
         designerId: uuidv1(),
diff --git a/packages/web/src/perspectives/PerspectiveTable.svelte b/packages/web/src/perspectives/PerspectiveTable.svelte
index 3c321ce30..62ac828de 100644
--- a/packages/web/src/perspectives/PerspectiveTable.svelte
+++ b/packages/web/src/perspectives/PerspectiveTable.svelte
@@ -372,6 +372,7 @@
     if (!display) return;
     await tick();
     if (!domTable) return;
+    if (!display) return;
     if (disableLoadNextRef.get()) return;
 
     const rowIndex = getLastVisibleRowIndex();