diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-picker/tree-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-picker/tree-picker-modal.element.ts
index ab022e1b8f..c4fdf36400 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-picker/tree-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-picker/tree-picker-modal.element.ts
@@ -41,13 +41,16 @@ export class UmbTreePickerModalElement<TreeItemType extends UmbTreeItemModelBase
 
 		if (_changedProperties.has('data')) {
 			this.#api.setData(this.data);
-			this._selectionConfiguration.multiple = this.data?.multiple ?? false;
-			this.#api.selection.setMultiple(this.data?.multiple ?? false);
+
+			const multiple = this.data?.multiple ?? false;
+			this._selectionConfiguration.multiple = multiple;
+			this.#api.selection.setMultiple(multiple);
 		}
 
 		if (_changedProperties.has('value')) {
-			this._selectionConfiguration.selection = this.value?.selection ?? [];
-			this.#api.selection.setSelection(this.value.selection);
+			const selection = this.value?.selection ?? [];
+			this._selectionConfiguration.selection = selection;
+			this.#api.selection.setSelection(selection);
 		}
 	}