diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/repository/webhook-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/repository/webhook-collection.server.data-source.ts
index a2172cc287..227d76a3a6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/repository/webhook-collection.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/repository/webhook-collection.server.data-source.ts
@@ -24,32 +24,32 @@ export class UmbWebhookCollectionServerDataSource implements UmbWebhookCollectio
 	}
 
 	/**
-	 * Gets the Wwbhook collection filtered by the given filter.
+	 * Gets the Webhook collection filtered by the given filter.
 	 * @param {UmbWebhookCollectionFilterModel} filter
 	 * @return {*}
 	 * @memberof UmbWebhookCollectionServerDataSource
 	 */
 	async getCollection(_filter: UmbWebhookCollectionFilterModel) {
-		const { data, error } = await tryExecuteAndNotify(this.#host, WebhookService.getItemWebhook({}));
+		const { data, error } = await tryExecuteAndNotify(this.#host, WebhookService.getWebhook(_filter));
 
-		if (data) {
-			const items = data.map((item) => {
-				const model: UmbWebhookDetailModel = {
-					entityType: UMB_WEBHOOK_ENTITY_TYPE,
-					unique: item.url,
-					name: item.name,
-					url: item.url,
-					enabled: item.enabled,
-					events: item.events.split(','),
-					contentTypes: item.types.split(','),
-				};
-
-				return model;
-			});
-
-			return { data: { items, total: data.length } };
+		if (error || !data) {
+			return { error };
 		}
 
-		return { error };
+		const items = data.items.map((item) => {
+			const model: UmbWebhookDetailModel = {
+				entityType: UMB_WEBHOOK_ENTITY_TYPE,
+				unique: item.url,
+				url: item.url,
+				enabled: item.enabled,
+				headers: item.headers,
+				events: item.events,
+				contentTypes: item.contentTypeKeys,
+			};
+
+			return model;
+		});
+
+		return { data: { items, total: data.items.length } };
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhook/repository/item/webhook-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/webhook/repository/item/webhook-item.server.data-source.ts
index 6cccb3a9e4..ccfd1e7edc 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/webhook/repository/item/webhook-item.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/webhook/repository/item/webhook-item.server.data-source.ts
@@ -1,23 +1,23 @@
-import type { UmbWebhookItemModel } from './types.js';
+import type { UmbLanguageItemModel } from './types.js';
 import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository';
-import type { WebhookItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
-import { WebhookService } from '@umbraco-cms/backoffice/external/backend-api';
+import type { LanguageItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
+import { LanguageService } from '@umbraco-cms/backoffice/external/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
 /**
- * A server data source for Webhook items
+ * A server data source for Language items
  * @export
- * @class UmbWebhookItemServerDataSource
+ * @class UmbLanguageItemServerDataSource
  * @implements {DocumentTreeDataSource}
  */
-export class UmbWebhookItemServerDataSource extends UmbItemServerDataSourceBase<
-	WebhookItemResponseModel,
-	UmbWebhookItemModel
+export class UmbLanguageItemServerDataSource extends UmbItemServerDataSourceBase<
+	LanguageItemResponseModel,
+	UmbLanguageItemModel
 > {
 	/**
-	 * Creates an instance of UmbWebhookItemServerDataSource.
+	 * Creates an instance of UmbLanguageItemServerDataSource.
 	 * @param {UmbControllerHost} host
-	 * @memberof UmbWebhookItemServerDataSource
+	 * @memberof UmbLanguageItemServerDataSource
 	 */
 	constructor(host: UmbControllerHost) {
 		super(host, {
@@ -28,9 +28,9 @@ export class UmbWebhookItemServerDataSource extends UmbItemServerDataSourceBase<
 }
 
 /* eslint-disable local-rules/no-direct-api-import */
-const getItems = (uniques: Array<string>) => WebhookService.getItemWebhook({ isoCode: uniques });
+const getItems = (uniques: Array<string>) => LanguageService.getItemLanguage({ isoCode: uniques });
 
-const mapper = (item: WebhookItemResponseModel): UmbWebhookItemModel => {
+const mapper = (item: LanguageItemResponseModel): UmbLanguageItemModel => {
 	return {
 		unique: item.isoCode,
 		name: item.name,