diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts
index e06be88c74..0695413cf1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts
@@ -16,7 +16,7 @@ export class UmbPropertyEditorUICheckboxListElement extends UmbLitElement implem
 		return this.#value;
 	}
 	public set value(value: Array<string>) {
-		this.#value = value || [];
+		this.#value = value ?? [];
 	}
 
 	@property({ type: Array, attribute: false })
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts
index a6b9ab6bed..e13fb01b6b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts
@@ -31,6 +31,7 @@ export class UmbPropertyEditorUIEyeDropperElement extends UmbLitElement implemen
 		this.dispatchEvent(new CustomEvent('property-value-change'));
 	}
 
+	// TODO: This should use the given value:
 	render() {
 		return html`<umb-input-eye-dropper
 			@change="${this._onChange}"
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element.ts
index cbe44fae8a..0961109412 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element.ts
@@ -30,9 +30,11 @@ export class UmbPropertyEditorUIIconPickerElement extends UmbLitElement implemen
 	}
 
 	private _openModal() {
+		// TODO: Modal should know the current selected one, and bring back the newly selected one.
 		this._modalContext?.open(UMB_ICON_PICKER_MODAL);
 	}
 
+	// TODO: We should show the current picked icon.
 	render() {
 		return html`
 			<uui-button
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/label/property-editor-ui-label.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/label/property-editor-ui-label.element.ts
index 0605b8b603..9aea140476 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/label/property-editor-ui-label.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/label/property-editor-ui-label.element.ts
@@ -19,7 +19,7 @@ export class UmbPropertyEditorUILabelElement extends UmbLitElement implements Um
 	public config?: UmbDataTypePropertyCollection;
 
 	render() {
-		return html`${this.value}`;
+		return html`${this.value ?? ''}`;
 	}
 
 	static styles = [UUITextStyles];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts
index f5458d06b4..37e46b0d08 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts
@@ -15,7 +15,7 @@ export class UmbPropertyEditorUIMediaPickerElement extends UmbLitElement impleme
 	public get value(): Array<string> {
 		return this._value;
 	}
-	public set value(value: Array<string>) {
+	public set value(value: Array<string> | undefined) {
 		this._value = value || [];
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
index 1f9fb1656d..3e6c588658 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
@@ -77,7 +77,7 @@ export class UmbPropertyEditorUIMultiUrlPickerElement
 			.ignoreUserStartNodes=${this._ignoreUserStartNodes}
 			.max=${this._maxNumber}
 			.min=${this._minNumber}
-			.urls="${this.value}"></umb-input-multi-url>`;
+			.urls="${this.value ?? []}"></umb-input-multi-url>`;
 	}
 
 	static styles = [UUITextStyles];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts
index d39b30b0dd..9de4b73f06 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts
@@ -68,7 +68,7 @@ export class UmbPropertyEditorUIMultipleTextStringElement
 
 	render() {
 		return html`<umb-input-multiple-text-string
-			.items="${this.value}"
+			.items="${this.value ?? []}"
 			min="${ifDefined(this._limitMin)}"
 			max="${ifDefined(this._limitMax)}"
 			@change=${this.#onChange}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/number/property-editor-ui-number.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/number/property-editor-ui-number.element.ts
index 35e9141f58..1b9b6ec51a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/number/property-editor-ui-number.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/number/property-editor-ui-number.element.ts
@@ -32,7 +32,7 @@ export class UmbPropertyEditorUINumberElement extends UmbLitElement implements U
 
 	render() {
 		return html`<uui-input
-			.value=${this.value}
+			.value=${this.value ?? 0}
 			type="number"
 			max="${ifDefined(this._max)}"
 			min="${ifDefined(this._min)}"
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts
index 8be96522ca..9593078431 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts
@@ -19,8 +19,8 @@ export class UmbPropertyEditorUIRadioButtonListElement
 	public get value(): string {
 		return this.#value;
 	}
-	public set value(value: string) {
-		this.#value = value || '';
+	public set value(value: string | undefined) {
+		this.#value = value?.trim() || '';
 	}
 
 	@property({ type: Array, attribute: false })
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/slider/property-editor-ui-slider.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/slider/property-editor-ui-slider.element.ts
index 9f33a13923..a34a51bd32 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/slider/property-editor-ui-slider.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/slider/property-editor-ui-slider.element.ts
@@ -1,4 +1,4 @@
-import UmbInputSliderElement from '../../../components/input-slider/input-slider.element.js';
+import { UmbInputSliderElement } from '../../../components/input-slider/input-slider.element.js';
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
@@ -11,10 +11,12 @@ import type { UmbDataTypePropertyCollection } from '@umbraco-cms/backoffice/comp
 @customElement('umb-property-editor-ui-slider')
 export class UmbPropertyEditorUISliderElement extends UmbLitElement implements UmbPropertyEditorExtensionElement {
 	@property()
-	value: {
-		to?: number;
-		from?: number;
-	} = {};
+	value:
+		| {
+				to?: number;
+				from?: number;
+		  }
+		| undefined = undefined;
 
 	@state()
 	_enableRange?: boolean;
@@ -57,6 +59,7 @@ export class UmbPropertyEditorUISliderElement extends UmbLitElement implements U
 		this.dispatchEvent(new CustomEvent('property-value-change'));
 	}
 
+	// TODO: This does not seem to take current value into account?
 	render() {
 		return html`<umb-input-slider
 			.initVal1="${this._initVal1 ?? 0}"
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/text-box/property-editor-ui-text-box.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/text-box/property-editor-ui-text-box.element.ts
index 68e01c2d35..16fd0cd44f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/text-box/property-editor-ui-text-box.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/text-box/property-editor-ui-text-box.element.ts
@@ -30,7 +30,7 @@ export class UmbPropertyEditorUITextBoxElement extends UmbLitElement implements
 
 	render() {
 		return html`<uui-input
-			.value=${this.value}
+			.value=${this.value ?? ''}
 			type="${this._type}"
 			maxlength="${ifDefined(this._maxChars)}"
 			@input=${this.onInput}></uui-input>`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/textarea/property-editor-ui-textarea.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/textarea/property-editor-ui-textarea.element.ts
index e795155667..fc0641e57f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/textarea/property-editor-ui-textarea.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/textarea/property-editor-ui-textarea.element.ts
@@ -47,7 +47,7 @@ export class UmbPropertyEditorUITextareaElement extends UmbLitElement implements
 	render() {
 		return html` <uui-textarea
 			label="Textarea"
-			.value=${this.value}
+			.value=${this.value ?? ''}
 			maxlength="${ifDefined(this._maxChars)}"
 			rows="${ifDefined(this._rows)}"
 			@input=${this.onInput}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/toggle/property-editor-ui-toggle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/toggle/property-editor-ui-toggle.element.ts
index 54d13be855..aec736e0b3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/toggle/property-editor-ui-toggle.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/toggle/property-editor-ui-toggle.element.ts
@@ -11,7 +11,7 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 @customElement('umb-property-editor-ui-toggle')
 export class UmbPropertyEditorUIToggleElement extends UmbLitElement implements UmbPropertyEditorExtensionElement {
 	@property()
-	value = false;
+	value: undefined | boolean = undefined;
 
 	@state()
 	_labelOff?: string;
@@ -24,7 +24,7 @@ export class UmbPropertyEditorUIToggleElement extends UmbLitElement implements U
 
 	@property({ type: Array, attribute: false })
 	public set config(config: UmbDataTypePropertyCollection) {
-		this.value = config.getValueByAlias('default') ?? false;
+		this.value ??= config.getValueByAlias('default') ?? false;
 		this._labelOff = config.getValueByAlias('labelOff');
 		this._labelOn = config.getValueByAlias('labelOn');
 		this._showLabels = config.getValueByAlias('showLabels');
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/value-type/property-editor-ui-value-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/value-type/property-editor-ui-value-type.element.ts
index cd04d22547..c6bdca39f8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/value-type/property-editor-ui-value-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/value-type/property-editor-ui-value-type.element.ts
@@ -11,8 +11,21 @@ import type { UmbDataTypePropertyCollection } from '@umbraco-cms/backoffice/comp
 
 @customElement('umb-property-editor-ui-value-type')
 export class UmbPropertyEditorUIValueTypeElement extends UmbLitElement implements UmbPropertyEditorExtensionElement {
+	private _value: string | undefined = undefined;
 	@property()
-	value = '';
+	public get value(): string | undefined {
+		return this._value;
+	}
+	public set value(value: string | undefined) {
+		this._value = value;
+
+		const selected = this._options.filter((option) => {
+			return (option.selected = option.value === this.value);
+		});
+		if (selected.length === 0) {
+			this._options[0].selected = true;
+		}
+	}
 
 	@state()
 	private _options: Array<Option> = [
@@ -25,16 +38,6 @@ export class UmbPropertyEditorUIValueTypeElement extends UmbLitElement implement
 		{ name: 'Long String', value: 'TEXT' },
 	];
 
-	constructor() {
-		super();
-	}
-
-	connectedCallback(): void {
-		super.connectedCallback();
-		const index = this._options.findIndex((option) => option.value === this.value);
-		index > 0 ? (this._options[index].selected = true) : (this._options[0].selected = true);
-	}
-
 	@property({ type: Array, attribute: false })
 	public config?: UmbDataTypePropertyCollection;