diff --git a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html
index 9cf973c103..34bb64ec1f 100644
--- a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html
+++ b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html
@@ -16,7 +16,6 @@
 ></nz-tree>
 <ng-template #treeTemplate let-node>
   <div
-    class="node-wrapper"
     [class.selected]="isNodeSelected(node)"
     [title]="node.title"
     (click)="onSelectedNodeChange(node)"
diff --git a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts
index 3f6179a5b2..24e2c8128a 100644
--- a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts
+++ b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts
@@ -3,6 +3,7 @@ import {
   ContentChild,
   EventEmitter,
   Input,
+  OnChanges,
   Output,
   TemplateRef,
   ViewEncapsulation,
@@ -24,7 +25,7 @@ export type DropEvent = NzFormatEmitEvent & { pos: number };
   ],
   encapsulation: ViewEncapsulation.None,
 })
-export class TreeComponent {
+export class TreeComponent implements OnChanges {
   dropPosition: number;
 
   dropdowns = {} as { [key: string]: NgbDropdown };
@@ -44,19 +45,31 @@ export class TreeComponent {
   @Input() nodes = [];
   @Input() expandedKeys: string[] = [];
   @Input() selectedNode: any;
+  @Input() changeCheckboxWithNode: boolean;
+  @Input() changedNodeValues = [];
   @Input() isNodeSelected = node => this.selectedNode?.id === node.key;
   @Input() beforeDrop = (event: NzFormatBeforeDropEvent) => {
     this.dropPosition = event.pos;
     return of(false);
   };
 
+  ngOnChanges() {
+    this.checkedKeys = [...this.changedNodeValues];
+  }
+
   onSelectedNodeChange(node) {
     this.selectedNode = node.origin.entity;
-    this.selectedNodeChange.emit(node.origin.entity);
+    if (this.changeCheckboxWithNode) {
+      this.selectedNodeChange.emit(node);
+      this.checkedKeys = [...this.changedNodeValues];
+      this.checkedKeysChange.emit(this.changedNodeValues);
+    } else {
+      this.selectedNodeChange.emit(node.origin.entity);
+    }
   }
 
   onCheckboxChange(event) {
-    this.checkedKeys = [...event.keys];
+    this.checkedKeys = this.changedNodeValues = [...event.keys];
     this.checkedKeysChange.emit(event.keys);
   }