diff --git a/packages/features/webhooks/components/WebhookForm.tsx b/packages/features/webhooks/components/WebhookForm.tsx
index 59e066e597..cdf670ad9e 100644
--- a/packages/features/webhooks/components/WebhookForm.tsx
+++ b/packages/features/webhooks/components/WebhookForm.tsx
@@ -121,6 +121,14 @@ const WebhookForm = (props: {
     },
   });
 
+  const showTimeSection = formMethods
+    .watch("eventTriggers")
+    ?.find(
+      (trigger) =>
+        trigger === WebhookTriggerEvents.AFTER_HOSTS_CAL_VIDEO_NO_SHOW ||
+        trigger === WebhookTriggerEvents.AFTER_GUESTS_CAL_VIDEO_NO_SHOW
+    );
+
   const [useCustomTemplate, setUseCustomTemplate] = useState(
     props?.webhook?.payloadTemplate !== undefined && props?.webhook?.payloadTemplate !== null
   );
@@ -128,14 +136,6 @@ const WebhookForm = (props: {
   const [changeSecret, setChangeSecret] = useState<boolean>(false);
   const hasSecretKey = !!props?.webhook?.secret;
 
-  const [showTimeSection, setShowTimeSection] = useState(
-    !!triggerOptions.find(
-      (trigger) =>
-        trigger.value === WebhookTriggerEvents.AFTER_HOSTS_CAL_VIDEO_NO_SHOW ||
-        trigger.value === WebhookTriggerEvents.AFTER_GUESTS_CAL_VIDEO_NO_SHOW
-    )
-  );
-
   useEffect(() => {
     if (changeSecret) {
       formMethods.unregister("secret", { keepDefaultValue: false });
@@ -219,8 +219,6 @@ const WebhookForm = (props: {
                       formMethods.setValue("time", undefined, { shouldDirty: true });
                       formMethods.setValue("timeUnit", undefined, { shouldDirty: true });
                     }
-
-                    setShowTimeSection(noShowWebhookTriggerExists);
                   }}
                 />
               </div>
diff --git a/packages/trpc/server/routers/viewer/webhook/edit.handler.ts b/packages/trpc/server/routers/viewer/webhook/edit.handler.ts
index 8e68f6ce8e..40e8294006 100644
--- a/packages/trpc/server/routers/viewer/webhook/edit.handler.ts
+++ b/packages/trpc/server/routers/viewer/webhook/edit.handler.ts
@@ -40,7 +40,11 @@ export const editHandler = async ({ input, ctx }: EditOptions) => {
     where: {
       id,
     },
-    data,
+    data: {
+      ...data,
+      time: data.time ?? null,
+      timeUnit: data.timeUnit ?? null,
+    },
   });
 
   if (data.active) {