diff --git a/packages/angular-sdk-components/src/lib/_components/template/default-form/default-form.component.ts b/packages/angular-sdk-components/src/lib/_components/template/default-form/default-form.component.ts
index 53808c39..c8013c53 100644
--- a/packages/angular-sdk-components/src/lib/_components/template/default-form/default-form.component.ts
+++ b/packages/angular-sdk-components/src/lib/_components/template/default-form/default-form.component.ts
@@ -73,4 +73,9 @@ export class DefaultFormComponent implements OnInit {
     //  normalize them
     this.arChildren$ = ReferenceComponent.normalizePConnArray(kids[0].getPConnect().getChildren());
   }
+
+  ngOnDestroy(): void {
+    // Clean up
+    PCore.getContextTreeManager().removeContextTreeNode(this.pConn$.getContextName());
+  }
 }