diff --git a/src/Umbraco.Web.UI.Client/libs/observable-api/basic-state.ts b/src/Umbraco.Web.UI.Client/libs/observable-api/basic-state.ts
index da449ed38c..3512c0508c 100644
--- a/src/Umbraco.Web.UI.Client/libs/observable-api/basic-state.ts
+++ b/src/Umbraco.Web.UI.Client/libs/observable-api/basic-state.ts
@@ -6,7 +6,7 @@ import { BehaviorSubject } from "rxjs";
  * @extends {BehaviorSubject<T>}
  * @description - A RxJS BehaviorSubject this Subject ensures the data is unique, not updating any Observes unless there is an actual change of the value.
  */
-export class BasicState<T extends string | number | undefined | null> extends BehaviorSubject<T> {
+export class BasicState<T> extends BehaviorSubject<T> {
 	constructor(initialData: T) {
 		super(initialData);
 	}
diff --git a/src/Umbraco.Web.UI.Client/libs/observable-api/number-state.ts b/src/Umbraco.Web.UI.Client/libs/observable-api/number-state.ts
index 8a2b775351..9d1cfd5c21 100644
--- a/src/Umbraco.Web.UI.Client/libs/observable-api/number-state.ts
+++ b/src/Umbraco.Web.UI.Client/libs/observable-api/number-state.ts
@@ -6,6 +6,9 @@ import { BasicState } from "./basic-state";
  * @extends {BehaviorSubject<T>}
  * @description - A RxJS BehaviorSubject this Subject ensures the data is unique, not updating any Observes unless there is an actual change of the value.
  */
-export class NumberState<T extends number | undefined | null> extends BasicState<T> {
+export class NumberState<T> extends BasicState<T | number> {
+	constructor(initialData: T | number) {
+		super(initialData);
+	}
 
 }
diff --git a/src/Umbraco.Web.UI.Client/libs/observable-api/string-state.ts b/src/Umbraco.Web.UI.Client/libs/observable-api/string-state.ts
index 4ec129fe84..7a92238a6a 100644
--- a/src/Umbraco.Web.UI.Client/libs/observable-api/string-state.ts
+++ b/src/Umbraco.Web.UI.Client/libs/observable-api/string-state.ts
@@ -3,9 +3,11 @@ import { BasicState } from "./basic-state";
 /**
  * @export
  * @class StringState
- * @extends {BehaviorSubject<T>}
+ * @extends {BasicState<T>}
  * @description - A RxJS BehaviorSubject this Subject ensures the data is unique, not updating any Observes unless there is an actual change of the value.
  */
-export class StringState<T extends string | undefined | null> extends BasicState<T> {
-
+export class StringState<T> extends BasicState<T | string> {
+	constructor(initialData: T | string) {
+		super(initialData);
+	}
 }