diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/content-property/content-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/content-property/content-property.element.ts
index 0e784996f6..da2062563f 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/content-property/content-property.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/content-property/content-property.element.ts
@@ -1,19 +1,18 @@
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
-import { css, html, LitElement } from 'lit';
+import { css, html } from 'lit';
 import { ifDefined } from 'lit-html/directives/if-defined.js';
 import { customElement, property, state } from 'lit/decorators.js';
 import { EMPTY, of, switchMap } from 'rxjs';
 
 import { UmbDataTypeStore } from '../../data-types/data-type.store';
-import { UmbObserverMixin } from '@umbraco-cms/observable-api';
 import type { ContentProperty, ManifestTypes } from '@umbraco-cms/models';
 import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
-import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
 
 import '../entity-property/entity-property.element';
+import { UmbLitElement } from 'src/core/element/lit-element.element';
 
 @customElement('umb-content-property')
-export class UmbContentPropertyElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) {
+export class UmbContentPropertyElement extends UmbLitElement {
 	static styles = [
 		UUITextStyles,
 		css`