diff --git a/modules/ppcp-settings/resources/js/data/common/resolvers.js b/modules/ppcp-settings/resources/js/data/common/resolvers.js
index 157c6d8d4..2c1f0d3c2 100644
--- a/modules/ppcp-settings/resources/js/data/common/resolvers.js
+++ b/modules/ppcp-settings/resources/js/data/common/resolvers.js
@@ -23,7 +23,9 @@ export const resolvers = {
 			const result = yield apiFetch( { path: REST_HYDRATE_PATH } );
 			const webhooks = yield apiFetch( { path: REST_WEBHOOKS } );
 
-			result.data = { ...result.data, ...webhooks.data };
+			if ( webhooks.success && webhooks.data ) {
+				result.webhooks = webhooks.data;
+			}
 
 			yield dispatch( STORE_NAME ).hydrate( result );
 			yield dispatch( STORE_NAME ).setIsReady( true );
diff --git a/modules/ppcp-settings/src/Endpoint/WebhookSettingsEndpoint.php b/modules/ppcp-settings/src/Endpoint/WebhookSettingsEndpoint.php
index 03092869b..df227264a 100644
--- a/modules/ppcp-settings/src/Endpoint/WebhookSettingsEndpoint.php
+++ b/modules/ppcp-settings/src/Endpoint/WebhookSettingsEndpoint.php
@@ -135,10 +135,8 @@ class WebhookSettingsEndpoint extends RestEndpoint {
 
 		return $this->return_success(
 			array(
-				'webhooks' => array(
-					'url'    => $webhook_url,
-					'events' => $webhook_events,
-				),
+				'url'    => $webhook_url,
+				'events' => $webhook_events,
 			)
 		);
 	}