diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-toolbar-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-toolbar-configuration.element.ts
index 4fd205cead..afe5c2b742 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-toolbar-configuration.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/components/property-editor-ui-tiptap-toolbar-configuration.element.ts
@@ -36,7 +36,7 @@ export class UmbPropertyEditorUiTiptapToolbarConfigurationElement
 	set value(value: UmbTiptapToolbarValue | undefined) {
 		if (!value) value = [[[]]];
 		if (value === this.#value) return;
-		this.#context.setToolbar(value);
+		this.#value = value;
 	}
 	get value(): UmbTiptapToolbarValue | undefined {
 		return this.#value?.map((rows) => rows.map((groups) => [...groups]));
@@ -66,6 +66,10 @@ export class UmbPropertyEditorUiTiptapToolbarConfigurationElement
 		});
 	}
 
+	protected override firstUpdated() {
+		this.#context.setToolbar(this.value);
+	}
+
 	#onClick(item: UmbTiptapToolbarExtension) {
 		const lastRow = (this.#value?.length ?? 1) - 1;
 		const lastGroup = (this.#value?.[lastRow].length ?? 1) - 1;