diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/index.ts
index d4702960d5..06c33f562f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/index.ts
@@ -1 +1 @@
-export * from './types.js';
+export type * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/index.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/index.ts
index f0f1ade33d..72d8944e05 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/index.ts
@@ -1,2 +1,4 @@
 export * from './components/index.js';
 export * from './extensions/index.js';
+
+export type * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/types.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/types.ts
index 1d9964b88b..fcbfd9b7eb 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/types.ts
@@ -1,6 +1,8 @@
 import type { UmbBlockValueType } from '@umbraco-cms/backoffice/block';
 import type { UmbBlockRteLayoutModel } from '@umbraco-cms/backoffice/block-rte';
 
+export type * from './extensions/types.js';
+
 // TODO: Rename this type:
 export interface UmbPropertyEditorUiValueType {
 	markup: string;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/ufm/types.ts b/src/Umbraco.Web.UI.Client/src/packages/ufm/types.ts
index e97116b6c1..8b2395e4a6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/ufm/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/ufm/types.ts
@@ -1,6 +1,6 @@
 import type { UmbUfmFilterApi } from './ufm-filter.extension.js';
 
-// TODO: This is not a type? So it should ideally be move to a different file. [NL]
+// TODO: this is not a type, in TypeScript world, as it is an actual class. So it should be moved elsewhere [NL]
 export abstract class UmbUfmFilterBase implements UmbUfmFilterApi {
 	abstract filter(...args: Array<unknown>): string | undefined | null;
 	destroy() {}