diff --git a/src/webhooks/components/WebhookEvents/WebhookEvents.tsx b/src/webhooks/components/WebhookEvents/WebhookEvents.tsx
index b26a92284..dda09bc3e 100644
--- a/src/webhooks/components/WebhookEvents/WebhookEvents.tsx
+++ b/src/webhooks/components/WebhookEvents/WebhookEvents.tsx
@@ -30,7 +30,7 @@ const WebhookEvents: React.StatelessComponent<WebhookEventsProps> = ({
       onChange({
         target: {
           name: "events",
-          value: event.target.value ? eventsEnum.map(event => event) : []
+          value: WebhookEventTypeEnum.ALL_EVENTS
         }
       } as any)
     );
diff --git a/src/webhooks/components/WebhooksDetailsPage/WebhooksDetailsPage.tsx b/src/webhooks/components/WebhooksDetailsPage/WebhooksDetailsPage.tsx
index f8a301ee2..675256f50 100644
--- a/src/webhooks/components/WebhooksDetailsPage/WebhooksDetailsPage.tsx
+++ b/src/webhooks/components/WebhooksDetailsPage/WebhooksDetailsPage.tsx
@@ -56,12 +56,8 @@ const WebhooksDetailsPage: React.StatelessComponent<
   const initialForm: FormData = {
     allEvents: maybe(
       () =>
-        Object.values(WebhookEventTypeEnum).filter(
-          perm =>
-            maybe(() => webhook.events, []).filter(
-              event => event.eventType === perm
-            ).length === 0
-        ).length === 0,
+        maybe(() => webhook.events, [])[0].eventType ===
+        WebhookEventTypeEnum.ALL_EVENTS,
       false
     ),
     events: maybe(() => webhook.events, []).map(event => event.eventType),
diff --git a/src/webhooks/views/WebhooksCreate.tsx b/src/webhooks/views/WebhooksCreate.tsx
index 0de8fcefc..2aaf021cb 100644
--- a/src/webhooks/views/WebhooksCreate.tsx
+++ b/src/webhooks/views/WebhooksCreate.tsx
@@ -2,6 +2,7 @@ import { WindowTitle } from "@saleor/components/WindowTitle";
 import useNavigator from "@saleor/hooks/useNavigator";
 import useNotifier from "@saleor/hooks/useNotifier";
 import { commonMessages } from "@saleor/intl";
+import { WebhookEventTypeEnum } from "@saleor/types/globalTypes";
 import { WebhookCreate as WebhookCreateData } from "@saleor/webhooks/types/WebhookCreate";
 import React from "react";
 import { useIntl } from "react-intl";
@@ -42,11 +43,13 @@ export const WebhooksCreate: React.StatelessComponent<
   return (
     <TypedWebhookCreate onCompleted={onSubmit}>
       {(WebhookCreate, webhookCreateOpts) => {
-        const handleSubmit = (data: FormData) =>
+        const handleSubmit = (data: FormData) => {
           WebhookCreate({
             variables: {
               input: {
-                events: data.events,
+                events: data.allEvents
+                  ? [WebhookEventTypeEnum.ALL_EVENTS]
+                  : data.events,
                 isActive: data.isActive,
                 name: data.name,
                 secretKey: data.secretKey,
@@ -55,6 +58,7 @@ export const WebhooksCreate: React.StatelessComponent<
               }
             }
           });
+        };
 
         const formTransitionState = getMutationState(
           webhookCreateOpts.called,
diff --git a/src/webhooks/views/WebhooksDetails.tsx b/src/webhooks/views/WebhooksDetails.tsx
index 7724f3f74..94f75d351 100644
--- a/src/webhooks/views/WebhooksDetails.tsx
+++ b/src/webhooks/views/WebhooksDetails.tsx
@@ -2,6 +2,7 @@ import { WindowTitle } from "@saleor/components/WindowTitle";
 import useNavigator from "@saleor/hooks/useNavigator";
 import useNotifier from "@saleor/hooks/useNotifier";
 import { commonMessages } from "@saleor/intl";
+import { WebhookEventTypeEnum } from "@saleor/types/globalTypes";
 import WebhookDeleteDialog from "@saleor/webhooks/components/WebhookDeleteDialog";
 import { WebhookDelete } from "@saleor/webhooks/types/WebhookDelete";
 import React from "react";
@@ -111,7 +112,9 @@ export const WebhooksDetails: React.StatelessComponent<
                               variables: {
                                 id,
                                 input: {
-                                  events: data.events,
+                                  events: data.allEvents
+                                    ? [WebhookEventTypeEnum.ALL_EVENTS]
+                                    : data.events,
                                   isActive: data.isActive,
                                   name: data.name,
                                   secretKey: data.secretKey,