diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/clear-formatting/clear-formatting.tiptap-toolbar-api.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/clear-formatting/clear-formatting.tiptap-toolbar-api.ts
index 0ee6d1efbede..ff1376fc7a39 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/clear-formatting/clear-formatting.tiptap-toolbar-api.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/clear-formatting/clear-formatting.tiptap-toolbar-api.ts
@@ -1,8 +1,13 @@
-import type { Editor } from '../../externals.js';
+import type { CommandProps, Editor } from '../../externals.js';
 import { UmbTiptapToolbarElementApiBase } from '../tiptap-toolbar-element-api-base.js';
 
 export default class UmbTiptapToolbarClearFormattingExtensionApi extends UmbTiptapToolbarElementApiBase {
 	override execute(editor?: Editor) {
-		editor?.chain().focus().clearNodes().unsetAllMarks().unsetClassName().unsetStyles().run();
+		const unsetAttrs: (props: CommandProps) => boolean = ({ commands }) => {
+			commands.unsetClassName?.();
+			commands.unsetStyles?.();
+			return true;
+		};
+		editor?.chain().focus()?.clearNodes().unsetAllMarks().command(unsetAttrs).run();
 	}
 }