diff --git a/src/Umbraco.Web.UI.Client/libs/picker/picker.context.ts b/src/Umbraco.Web.UI.Client/libs/picker/picker.context.ts
index 9b49179712..42f9ec025d 100644
--- a/src/Umbraco.Web.UI.Client/libs/picker/picker.context.ts
+++ b/src/Umbraco.Web.UI.Client/libs/picker/picker.context.ts
@@ -75,7 +75,7 @@ export class UmbPickerContext<ItemType extends ItemResponseModelBaseModel> {
 	}
 
 	// TODO: revisit this method. How do we best pass picker data?
-	openPicker(pickerData: any) {
+	openPicker(pickerData?: any) {
 		if (!this.modalContext) throw new Error('Modal context is not initialized');
 
 		const modalHandler = this.modalContext.open(this.modalAlias, {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/components/data-type-input/data-type-input.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/components/data-type-input/data-type-input.element.ts
index 7e86e55ce4..58d541eeb9 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/components/data-type-input/data-type-input.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/components/data-type-input/data-type-input.element.ts
@@ -20,13 +20,14 @@ export class UmbDataTypeInputElement extends FormControlMixin(UmbLitElement) {
 	 * This is a minimum amount of selected items in this input.
 	 * @type {number}
 	 * @attr
-	 * @default undefined
+	 * @default 0
 	 */
 	@property({ type: Number })
-	public set min(value: number | undefined) {
-		if (value !== undefined) {
-			this.#pickerContext.min = value;
-		}
+	public get min(): number {
+		return this.#pickerContext.min;
+	}
+	public set min(value: number) {
+		this.#pickerContext.min = value;
 	}
 
 	/**
@@ -42,18 +43,14 @@ export class UmbDataTypeInputElement extends FormControlMixin(UmbLitElement) {
 	 * This is a maximum amount of selected items in this input.
 	 * @type {number}
 	 * @attr
-	 * @default undefined
+	 * @default Infinity
 	 */
-	private _max: number | undefined;
 	@property({ type: Number })
-	public get max(): number | undefined {
-		return this._max;
+	public get max(): number {
+		return this.#pickerContext.max;
 	}
-	public set max(value: number | undefined) {
-		if (value !== undefined) {
-			this.#pickerContext.max = value;
-		}
-		this._max = value;
+	public set max(value: number) {
+		this.#pickerContext.max = value;
 	}
 
 	/**
@@ -101,7 +98,7 @@ export class UmbDataTypeInputElement extends FormControlMixin(UmbLitElement) {
 			() => !!this.max && this._selectedIds.length > this.max
 		);
 
-		this.observe(this.#pickerContext.selection, (selection) => (this.selectedIds = selection));
+		this.observe(this.#pickerContext.selection, (selection) => (this._selectedIds = selection));
 		this.observe(this.#pickerContext.selectedItems, (selectedItems) => (this._items = selectedItems));
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-language-picker/input-language-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-language-picker/input-language-picker.element.ts
index 961f3f9572..53e5a7ff46 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-language-picker/input-language-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-language-picker/input-language-picker.element.ts
@@ -44,7 +44,7 @@ export class UmbInputLanguagePickerElement extends FormControlMixin(UmbLitElemen
 	 * This is a maximum amount of selected items in this input.
 	 * @type {number}
 	 * @attr
-	 * @default Infinite
+	 * @default Infinity
 	 */
 	@property({ type: Number })
 	public get max(): number {