diff --git a/apps/remix/app/components/general/envelope-editor/envelope-editor-settings-dialog.tsx b/apps/remix/app/components/general/envelope-editor/envelope-editor-settings-dialog.tsx
index 73f8cf7e5..ea60d1819 100644
--- a/apps/remix/app/components/general/envelope-editor/envelope-editor-settings-dialog.tsx
+++ b/apps/remix/app/components/general/envelope-editor/envelope-editor-settings-dialog.tsx
@@ -9,7 +9,7 @@ import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants
 import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import { AppError } from '@documenso/lib/errors/app-error';
 import { ZDocumentAccessAuthTypesSchema, ZDocumentActionAuthTypesSchema } from '@documenso/lib/types/document-auth';
-import { ZDocumentEmailSettingsSchema } from '@documenso/lib/types/document-email';
+import { DocumentEmailEvents, ZDocumentEmailSettingsSchema } from '@documenso/lib/types/document-email';
 import {
   type TDocumentMetaDateFormat,
   ZDocumentMetaDateFormatSchema,
@@ -39,6 +39,7 @@ import { ExpirationPeriodPicker } from '@documenso/ui/components/document/expira
 import { ReminderSettingsPicker } from '@documenso/ui/components/document/reminder-settings-picker';
 import { TemplateTypeSelect, TemplateTypeTooltip } from '@documenso/ui/components/template/template-type-select';
 import { cn } from '@documenso/ui/lib/utils';
+import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
 import { CardDescription, CardHeader, CardTitle } from '@documenso/ui/primitives/card';
 import { Combobox } from '@documenso/ui/primitives/combobox';
@@ -114,7 +115,7 @@ export const ZAddSettingsFormSchema = z.object({
   }),
 });
 
-type EnvelopeEditorSettingsTabType = 'general' | 'reminders' | 'email' | 'security';
+type EnvelopeEditorSettingsTabType = 'general' | 'reminders' | 'notifications' | 'security';
 
 const tabs = [
   {
@@ -130,10 +131,10 @@ const tabs = [
     description: msg`Configure signing reminder settings for the document.`,
   },
   {
-    id: 'email',
-    title: msg`Email`,
+    id: 'notifications',
+    title: msg`Notifications`,
     icon: MailIcon,
-    description: msg`Configure email settings for the document.`,
+    description: msg`Configure notification settings for the document.`,
   },
   {
     id: 'security',
@@ -143,6 +144,18 @@ const tabs = [
   },
 ] as const;
 
+// Recipient-facing notification events. These are suppressed at send time
+// when distributionMethod is not EMAIL (see extractDerivedDocumentEmailSettings),
+// so the UI mirrors that by disabling the matching checkboxes.
+const RECIPIENT_EMAIL_EVENTS = [
+  DocumentEmailEvents.RecipientSigningRequest,
+  DocumentEmailEvents.RecipientRemoved,
+  DocumentEmailEvents.RecipientSigned,
+  DocumentEmailEvents.DocumentPending,
+  DocumentEmailEvents.DocumentCompleted,
+  DocumentEmailEvents.DocumentDeleted,
+] as const;
+
 type TAddSettingsFormSchema = z.infer<typeof ZAddSettingsFormSchema>;
 
 type EnvelopeEditorSettingsDialogProps = {
@@ -205,6 +218,8 @@ export const EnvelopeEditorSettingsDialog = ({ trigger, ...props }: EnvelopeEdit
     );
 
   const emailSettings = form.watch('meta.emailSettings');
+  const distributionMethod = form.watch('meta.distributionMethod');
+  const isEmailDistribution = distributionMethod === DocumentDistributionMethod.EMAIL;
 
   const { data: emailData, isLoading: isLoadingEmails } = trpc.enterprise.organisation.email.find.useQuery(
     {
@@ -334,7 +349,7 @@ export const EnvelopeEditorSettingsDialog = ({ trigger, ...props }: EnvelopeEdit
 
           <nav className="col-span-12 mb-8 flex flex-wrap items-center justify-start gap-x-2 gap-y-4 px-4 md:col-span-3 md:w-full md:flex-col md:items-start md:gap-y-2">
             {tabs.map((tab) => {
-              if (tab.id === 'email' && !settings.allowConfigureDistribution) {
+              if (tab.id === 'notifications' && !settings.allowConfigureDistribution) {
                 return null;
               }
 
@@ -730,7 +745,7 @@ export const EnvelopeEditorSettingsDialog = ({ trigger, ...props }: EnvelopeEdit
                       )}
                     />
                   ))
-                  .with({ activeTab: 'email', settings: { allowConfigureDistribution: true } }, () => (
+                  .with({ activeTab: 'notifications', settings: { allowConfigureDistribution: true } }, () => (
                     <>
                       {settings.allowConfigureEmailSender && organisation.organisationClaim.flags.emailDomains && (
                         <FormField
@@ -747,6 +762,7 @@ export const EnvelopeEditorSettingsDialog = ({ trigger, ...props }: EnvelopeEdit
                                   {...field}
                                   value={field.value === null ? '-1' : field.value}
                                   onValueChange={(value) => field.onChange(value === '-1' ? null : value)}
+                                  disabled={!isEmailDistribution}
                                 >
                                   <SelectTrigger loading={isLoadingEmails} className="bg-background">
                                     <SelectValue />
@@ -783,7 +799,7 @@ export const EnvelopeEditorSettingsDialog = ({ trigger, ...props }: EnvelopeEdit
                               </FormLabel>
 
                               <FormControl>
-                                <Input {...field} />
+                                <Input {...field} disabled={!isEmailDistribution} />
                               </FormControl>
 
                               <FormMessage />
@@ -804,7 +820,7 @@ export const EnvelopeEditorSettingsDialog = ({ trigger, ...props }: EnvelopeEdit
                             </FormLabel>
 
                             <FormControl>
-                              <Input {...field} />
+                              <Input {...field} disabled={!isEmailDistribution} />
                             </FormControl>
 
                             <FormMessage />
@@ -832,7 +848,11 @@ export const EnvelopeEditorSettingsDialog = ({ trigger, ...props }: EnvelopeEdit
                             </FormLabel>
 
                             <FormControl>
-                              <Textarea className="h-16 resize-none bg-background" {...field} />
+                              <Textarea
+                                className="h-16 resize-none bg-background"
+                                {...field}
+                                disabled={!isEmailDistribution}
+                              />
                             </FormControl>
 
                             <FormMessage />
@@ -843,7 +863,19 @@ export const EnvelopeEditorSettingsDialog = ({ trigger, ...props }: EnvelopeEdit
                       <DocumentEmailCheckboxes
                         value={emailSettings}
                         onChange={(value) => form.setValue('meta.emailSettings', value)}
+                        hiddenEvents={isEmailDistribution ? undefined : RECIPIENT_EMAIL_EVENTS}
                       />
+
+                      {!isEmailDistribution && (
+                        <Alert variant="warning">
+                          <AlertDescription>
+                            <Trans>
+                              Email distribution needs to be enabled in the general settings tab to configure recipient
+                              email related settings.
+                            </Trans>
+                          </AlertDescription>
+                        </Alert>
+                      )}
                     </>
                   ))
                   .with({ activeTab: 'security' }, () => (
diff --git a/packages/app-tests/e2e/envelope-editor-v2/envelope-settings.spec.ts b/packages/app-tests/e2e/envelope-editor-v2/envelope-settings.spec.ts
index da7dbb696..27e038524 100644
--- a/packages/app-tests/e2e/envelope-editor-v2/envelope-settings.spec.ts
+++ b/packages/app-tests/e2e/envelope-editor-v2/envelope-settings.spec.ts
@@ -115,6 +115,21 @@ const runSettingsFlow = async ({ root }: TEnvelopeEditorSurface, { externalId, i
 
   await root.locator('input[name="externalId"]').fill(externalId);
   await root.locator('input[name="meta.redirectUrl"]').fill(TEST_SETTINGS_VALUES.redirectUrl);
+  await root.getByRole('button', { name: 'Notifications' }).click();
+  // Fill email-content fields and toggle recipient-facing notification checkboxes
+  // while distributionMethod is still EMAIL. After it flips to NONE below, these
+  // controls are disabled because no email is sent to recipients.
+  await root.locator('input[name="meta.subject"]').fill(TEST_SETTINGS_VALUES.subject);
+  await root.locator('textarea[name="meta.message"]').fill(TEST_SETTINGS_VALUES.message);
+  await root.locator('input[name="meta.emailReplyTo"]').fill(TEST_SETTINGS_VALUES.replyTo);
+  await root.locator('#recipientSigned').click();
+  await root.locator('#recipientSigningRequest').click();
+  await root.locator('#recipientRemoved').click();
+  await root.locator('#documentPending').click();
+  await root.locator('#documentCompleted').click();
+  await root.locator('#documentDeleted').click();
+
+  await root.getByRole('button', { name: 'General' }).click();
 
   await root.locator('[data-testid="documentDistributionMethodSelectValue"]').click();
   await root.getByRole('option', { name: TEST_SETTINGS_VALUES.distributionMethod }).click();
@@ -190,19 +205,35 @@ const runSettingsFlow = async ({ root }: TEnvelopeEditorSurface, { externalId, i
   await root.getByRole('option', { name: TEST_SETTINGS_VALUES.reminderRepeatUnit }).click();
   await clickSettingsDialogHeader(root);
 
-  await root.getByRole('button', { name: 'Email' }).click();
-  await root.locator('#recipientSigned').click();
-  await root.locator('#recipientSigningRequest').click();
-  await root.locator('#recipientRemoved').click();
-  await root.locator('#documentPending').click();
-  await root.locator('#documentCompleted').click();
-  await root.locator('#documentDeleted').click();
+  await root.getByRole('button', { name: 'Notifications' }).click();
+
+  // Distribution is NONE: email-content fields stay rendered but disabled,
+  // recipient-facing checkboxes are hidden entirely and replaced by an alert,
+  // owner-facing checkboxes stay editable so we toggle them here.
+  await expect(root.locator('input[name="meta.subject"]')).toBeDisabled();
+  await expect(root.locator('textarea[name="meta.message"]')).toBeDisabled();
+  await expect(root.locator('input[name="meta.emailReplyTo"]')).toBeDisabled();
+  await expect(root.locator('#recipientSigned')).toHaveCount(0);
+  await expect(root.locator('#recipientSigningRequest')).toHaveCount(0);
+  await expect(root.locator('#recipientRemoved')).toHaveCount(0);
+  await expect(root.locator('#documentPending')).toHaveCount(0);
+  await expect(root.locator('#documentCompleted')).toHaveCount(0);
+  await expect(root.locator('#documentDeleted')).toHaveCount(0);
+  await expect(root.getByText(/Email distribution needs to be enabled/)).toBeVisible();
+
+  // Email Sender select only renders when the org has the emailDomains feature
+  // flag plus allowConfigureEmailSender, so the assertion is conditional.
+  const emailSenderSelect = getComboboxByLabel(root, 'Email Sender');
+  const hasEmailSenderSelect = (await emailSenderSelect.count()) > 0;
+
+  if (hasEmailSenderSelect) {
+    await expect(emailSenderSelect).toBeDisabled();
+  }
+
+  await expect(root.locator('#ownerDocumentCompleted')).toBeEnabled();
   await root.locator('#ownerDocumentCompleted').click();
   await root.locator('#ownerRecipientExpired').click();
   await root.locator('#ownerDocumentCreated').click();
-  await root.locator('input[name="meta.emailReplyTo"]').fill(TEST_SETTINGS_VALUES.replyTo);
-  await root.locator('input[name="meta.subject"]').fill(TEST_SETTINGS_VALUES.subject);
-  await root.locator('textarea[name="meta.message"]').fill(TEST_SETTINGS_VALUES.message);
 
   await root.getByRole('button', { name: 'Security' }).click();
   await selectMultiSelectOption(root, 'documentAccessSelectValue', TEST_SETTINGS_VALUES.accessAuth);
@@ -264,13 +295,17 @@ const runSettingsFlow = async ({ root }: TEnvelopeEditorSurface, { externalId, i
     TEST_SETTINGS_VALUES.reminderRepeatUnit,
   );
 
-  await root.getByRole('button', { name: 'Email' }).click();
-  await expect(root.locator('#recipientSigned')).toHaveAttribute('aria-checked', 'false');
-  await expect(root.locator('#recipientSigningRequest')).toHaveAttribute('aria-checked', 'false');
-  await expect(root.locator('#recipientRemoved')).toHaveAttribute('aria-checked', 'false');
-  await expect(root.locator('#documentPending')).toHaveAttribute('aria-checked', 'false');
-  await expect(root.locator('#documentCompleted')).toHaveAttribute('aria-checked', 'false');
-  await expect(root.locator('#documentDeleted')).toHaveAttribute('aria-checked', 'false');
+  await root.getByRole('button', { name: 'Notifications' }).click();
+  // Distribution persisted as NONE: recipient-facing checkboxes are hidden, owner-facing
+  // checkboxes remain visible and persist their stored values. Email-content fields are
+  // still rendered (disabled) and persist their stored values.
+  await expect(root.locator('#recipientSigned')).toHaveCount(0);
+  await expect(root.locator('#recipientSigningRequest')).toHaveCount(0);
+  await expect(root.locator('#recipientRemoved')).toHaveCount(0);
+  await expect(root.locator('#documentPending')).toHaveCount(0);
+  await expect(root.locator('#documentCompleted')).toHaveCount(0);
+  await expect(root.locator('#documentDeleted')).toHaveCount(0);
+  await expect(root.getByText(/Email distribution needs to be enabled/)).toBeVisible();
   await expect(root.locator('#ownerDocumentCompleted')).toHaveAttribute('aria-checked', 'false');
   await expect(root.locator('#ownerRecipientExpired')).toHaveAttribute('aria-checked', 'false');
   await expect(root.locator('#ownerDocumentCreated')).toHaveAttribute('aria-checked', 'false');
diff --git a/packages/ui/components/document/document-email-checkboxes.tsx b/packages/ui/components/document/document-email-checkboxes.tsx
index 996e4f60a..0d2a44dd8 100644
--- a/packages/ui/components/document/document-email-checkboxes.tsx
+++ b/packages/ui/components/document/document-email-checkboxes.tsx
@@ -13,334 +13,361 @@ type DocumentEmailCheckboxesProps = {
   value: Value;
   onChange: (value: Value) => void;
   className?: string;
+  hiddenEvents?: readonly DocumentEmailEvents[];
 };
 
-export const DocumentEmailCheckboxes = ({ value, onChange, className }: DocumentEmailCheckboxesProps) => {
+export const DocumentEmailCheckboxes = ({ value, onChange, className, hiddenEvents }: DocumentEmailCheckboxesProps) => {
+  const isHidden = (event: DocumentEmailEvents) => hiddenEvents?.includes(event) ?? false;
+
   return (
     <div className={cn('space-y-3', className)}>
-      <div className="flex flex-row items-center">
-        <Checkbox
-          id={DocumentEmailEvents.RecipientSigned}
-          className="h-5 w-5"
-          checked={value.recipientSigned}
-          onCheckedChange={(checked) => onChange({ ...value, [DocumentEmailEvents.RecipientSigned]: Boolean(checked) })}
-        />
+      {!isHidden(DocumentEmailEvents.RecipientSigned) && (
+        <div className="flex flex-row items-center">
+          <Checkbox
+            id={DocumentEmailEvents.RecipientSigned}
+            className="h-5 w-5"
+            checked={value.recipientSigned}
+            onCheckedChange={(checked) =>
+              onChange({ ...value, [DocumentEmailEvents.RecipientSigned]: Boolean(checked) })
+            }
+          />
 
-        <label
-          className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
-          htmlFor={DocumentEmailEvents.RecipientSigned}
-        >
-          <Trans>Email the owner when a recipient signs</Trans>
+          <label
+            className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
+            htmlFor={DocumentEmailEvents.RecipientSigned}
+          >
+            <Trans>Email the owner when a recipient signs</Trans>
 
-          <Tooltip>
-            <TooltipTrigger>
-              <InfoIcon className="mx-2 h-4 w-4" />
-            </TooltipTrigger>
+            <Tooltip>
+              <TooltipTrigger>
+                <InfoIcon className="mx-2 h-4 w-4" />
+              </TooltipTrigger>
 
-            <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
-              <h2>
-                <strong>
-                  <Trans>Recipient signed email</Trans>
-                </strong>
-              </h2>
+              <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
+                <h2>
+                  <strong>
+                    <Trans>Recipient signed email</Trans>
+                  </strong>
+                </h2>
 
-              <p>
-                <Trans>This email is sent to the document owner when a recipient has signed the document.</Trans>
-              </p>
-            </TooltipContent>
-          </Tooltip>
-        </label>
-      </div>
+                <p>
+                  <Trans>This email is sent to the document owner when a recipient has signed the document.</Trans>
+                </p>
+              </TooltipContent>
+            </Tooltip>
+          </label>
+        </div>
+      )}
 
-      <div className="flex flex-row items-center">
-        <Checkbox
-          id={DocumentEmailEvents.RecipientSigningRequest}
-          className="h-5 w-5"
-          checked={value.recipientSigningRequest}
-          onCheckedChange={(checked) =>
-            onChange({ ...value, [DocumentEmailEvents.RecipientSigningRequest]: Boolean(checked) })
-          }
-        />
+      {!isHidden(DocumentEmailEvents.RecipientSigningRequest) && (
+        <div className="flex flex-row items-center">
+          <Checkbox
+            id={DocumentEmailEvents.RecipientSigningRequest}
+            className="h-5 w-5"
+            checked={value.recipientSigningRequest}
+            onCheckedChange={(checked) =>
+              onChange({ ...value, [DocumentEmailEvents.RecipientSigningRequest]: Boolean(checked) })
+            }
+          />
 
-        <label
-          className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
-          htmlFor={DocumentEmailEvents.RecipientSigningRequest}
-        >
-          <Trans>Email recipients with a signing request</Trans>
+          <label
+            className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
+            htmlFor={DocumentEmailEvents.RecipientSigningRequest}
+          >
+            <Trans>Email recipients with a signing request</Trans>
 
-          <Tooltip>
-            <TooltipTrigger>
-              <InfoIcon className="mx-2 h-4 w-4" />
-            </TooltipTrigger>
+            <Tooltip>
+              <TooltipTrigger>
+                <InfoIcon className="mx-2 h-4 w-4" />
+              </TooltipTrigger>
 
-            <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
-              <h2>
-                <strong>
-                  <Trans>Recipient signing request email</Trans>
-                </strong>
-              </h2>
+              <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
+                <h2>
+                  <strong>
+                    <Trans>Recipient signing request email</Trans>
+                  </strong>
+                </h2>
 
-              <p>
-                <Trans>This email is sent to the recipient requesting them to sign the document.</Trans>
-              </p>
-            </TooltipContent>
-          </Tooltip>
-        </label>
-      </div>
+                <p>
+                  <Trans>This email is sent to the recipient requesting them to sign the document.</Trans>
+                </p>
+              </TooltipContent>
+            </Tooltip>
+          </label>
+        </div>
+      )}
 
-      <div className="flex flex-row items-center">
-        <Checkbox
-          id={DocumentEmailEvents.RecipientRemoved}
-          className="h-5 w-5"
-          checked={value.recipientRemoved}
-          onCheckedChange={(checked) =>
-            onChange({ ...value, [DocumentEmailEvents.RecipientRemoved]: Boolean(checked) })
-          }
-        />
+      {!isHidden(DocumentEmailEvents.RecipientRemoved) && (
+        <div className="flex flex-row items-center">
+          <Checkbox
+            id={DocumentEmailEvents.RecipientRemoved}
+            className="h-5 w-5"
+            checked={value.recipientRemoved}
+            onCheckedChange={(checked) =>
+              onChange({ ...value, [DocumentEmailEvents.RecipientRemoved]: Boolean(checked) })
+            }
+          />
 
-        <label
-          className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
-          htmlFor={DocumentEmailEvents.RecipientRemoved}
-        >
-          <Trans>Email recipients when they're removed from a pending document</Trans>
+          <label
+            className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
+            htmlFor={DocumentEmailEvents.RecipientRemoved}
+          >
+            <Trans>Email recipients when they're removed from a pending document</Trans>
 
-          <Tooltip>
-            <TooltipTrigger>
-              <InfoIcon className="mx-2 h-4 w-4" />
-            </TooltipTrigger>
+            <Tooltip>
+              <TooltipTrigger>
+                <InfoIcon className="mx-2 h-4 w-4" />
+              </TooltipTrigger>
 
-            <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
-              <h2>
-                <strong>
-                  <Trans>Recipient removed email</Trans>
-                </strong>
-              </h2>
+              <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
+                <h2>
+                  <strong>
+                    <Trans>Recipient removed email</Trans>
+                  </strong>
+                </h2>
 
-              <p>
-                <Trans>This email is sent to the recipient if they are removed from a pending document.</Trans>
-              </p>
-            </TooltipContent>
-          </Tooltip>
-        </label>
-      </div>
+                <p>
+                  <Trans>This email is sent to the recipient if they are removed from a pending document.</Trans>
+                </p>
+              </TooltipContent>
+            </Tooltip>
+          </label>
+        </div>
+      )}
 
-      <div className="flex flex-row items-center">
-        <Checkbox
-          id={DocumentEmailEvents.DocumentPending}
-          className="h-5 w-5"
-          checked={value.documentPending}
-          onCheckedChange={(checked) => onChange({ ...value, [DocumentEmailEvents.DocumentPending]: Boolean(checked) })}
-        />
+      {!isHidden(DocumentEmailEvents.DocumentPending) && (
+        <div className="flex flex-row items-center">
+          <Checkbox
+            id={DocumentEmailEvents.DocumentPending}
+            className="h-5 w-5"
+            checked={value.documentPending}
+            onCheckedChange={(checked) =>
+              onChange({ ...value, [DocumentEmailEvents.DocumentPending]: Boolean(checked) })
+            }
+          />
 
-        <label
-          className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
-          htmlFor={DocumentEmailEvents.DocumentPending}
-        >
-          <Trans>Email the signer if the document is still pending</Trans>
+          <label
+            className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
+            htmlFor={DocumentEmailEvents.DocumentPending}
+          >
+            <Trans>Email the signer if the document is still pending</Trans>
 
-          <Tooltip>
-            <TooltipTrigger>
-              <InfoIcon className="mx-2 h-4 w-4" />
-            </TooltipTrigger>
+            <Tooltip>
+              <TooltipTrigger>
+                <InfoIcon className="mx-2 h-4 w-4" />
+              </TooltipTrigger>
 
-            <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
-              <h2>
-                <strong>
-                  <Trans>Document pending email</Trans>
-                </strong>
-              </h2>
+              <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
+                <h2>
+                  <strong>
+                    <Trans>Document pending email</Trans>
+                  </strong>
+                </h2>
 
-              <p>
-                <Trans>
-                  This email will be sent to the recipient who has just signed the document, if there are still other
-                  recipients who have not signed yet.
-                </Trans>
-              </p>
-            </TooltipContent>
-          </Tooltip>
-        </label>
-      </div>
+                <p>
+                  <Trans>
+                    This email will be sent to the recipient who has just signed the document, if there are still other
+                    recipients who have not signed yet.
+                  </Trans>
+                </p>
+              </TooltipContent>
+            </Tooltip>
+          </label>
+        </div>
+      )}
 
-      <div className="flex flex-row items-center">
-        <Checkbox
-          id={DocumentEmailEvents.DocumentCompleted}
-          className="h-5 w-5"
-          checked={value.documentCompleted}
-          onCheckedChange={(checked) =>
-            onChange({ ...value, [DocumentEmailEvents.DocumentCompleted]: Boolean(checked) })
-          }
-        />
+      {!isHidden(DocumentEmailEvents.DocumentCompleted) && (
+        <div className="flex flex-row items-center">
+          <Checkbox
+            id={DocumentEmailEvents.DocumentCompleted}
+            className="h-5 w-5"
+            checked={value.documentCompleted}
+            onCheckedChange={(checked) =>
+              onChange({ ...value, [DocumentEmailEvents.DocumentCompleted]: Boolean(checked) })
+            }
+          />
 
-        <label
-          className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
-          htmlFor={DocumentEmailEvents.DocumentCompleted}
-        >
-          <Trans>Email recipients when the document is completed</Trans>
+          <label
+            className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
+            htmlFor={DocumentEmailEvents.DocumentCompleted}
+          >
+            <Trans>Email recipients when the document is completed</Trans>
 
-          <Tooltip>
-            <TooltipTrigger>
-              <InfoIcon className="mx-2 h-4 w-4" />
-            </TooltipTrigger>
+            <Tooltip>
+              <TooltipTrigger>
+                <InfoIcon className="mx-2 h-4 w-4" />
+              </TooltipTrigger>
 
-            <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
-              <h2>
-                <strong>
-                  <Trans>Document completed email</Trans>
-                </strong>
-              </h2>
+              <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
+                <h2>
+                  <strong>
+                    <Trans>Document completed email</Trans>
+                  </strong>
+                </h2>
 
-              <p>
-                <Trans>This will be sent to all recipients once the document has been fully completed.</Trans>
-              </p>
-            </TooltipContent>
-          </Tooltip>
-        </label>
-      </div>
+                <p>
+                  <Trans>This will be sent to all recipients once the document has been fully completed.</Trans>
+                </p>
+              </TooltipContent>
+            </Tooltip>
+          </label>
+        </div>
+      )}
 
-      <div className="flex flex-row items-center">
-        <Checkbox
-          id={DocumentEmailEvents.DocumentDeleted}
-          className="h-5 w-5"
-          checked={value.documentDeleted}
-          onCheckedChange={(checked) => onChange({ ...value, [DocumentEmailEvents.DocumentDeleted]: Boolean(checked) })}
-        />
+      {!isHidden(DocumentEmailEvents.DocumentDeleted) && (
+        <div className="flex flex-row items-center">
+          <Checkbox
+            id={DocumentEmailEvents.DocumentDeleted}
+            className="h-5 w-5"
+            checked={value.documentDeleted}
+            onCheckedChange={(checked) =>
+              onChange({ ...value, [DocumentEmailEvents.DocumentDeleted]: Boolean(checked) })
+            }
+          />
 
-        <label
-          className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
-          htmlFor={DocumentEmailEvents.DocumentDeleted}
-        >
-          <Trans>Email recipients when a pending document is deleted</Trans>
+          <label
+            className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
+            htmlFor={DocumentEmailEvents.DocumentDeleted}
+          >
+            <Trans>Email recipients when a pending document is deleted</Trans>
 
-          <Tooltip>
-            <TooltipTrigger>
-              <InfoIcon className="mx-2 h-4 w-4" />
-            </TooltipTrigger>
+            <Tooltip>
+              <TooltipTrigger>
+                <InfoIcon className="mx-2 h-4 w-4" />
+              </TooltipTrigger>
 
-            <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
-              <h2>
-                <strong>
-                  <Trans>Document deleted email</Trans>
-                </strong>
-              </h2>
+              <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
+                <h2>
+                  <strong>
+                    <Trans>Document deleted email</Trans>
+                  </strong>
+                </h2>
 
-              <p>
-                <Trans>This will be sent to all recipients if a pending document has been deleted.</Trans>
-              </p>
-            </TooltipContent>
-          </Tooltip>
-        </label>
-      </div>
+                <p>
+                  <Trans>This will be sent to all recipients if a pending document has been deleted.</Trans>
+                </p>
+              </TooltipContent>
+            </Tooltip>
+          </label>
+        </div>
+      )}
 
-      <div className="flex flex-row items-center">
-        <Checkbox
-          id={DocumentEmailEvents.OwnerDocumentCompleted}
-          className="h-5 w-5"
-          checked={value.ownerDocumentCompleted}
-          onCheckedChange={(checked) =>
-            onChange({ ...value, [DocumentEmailEvents.OwnerDocumentCompleted]: Boolean(checked) })
-          }
-        />
+      {!isHidden(DocumentEmailEvents.OwnerDocumentCompleted) && (
+        <div className="flex flex-row items-center">
+          <Checkbox
+            id={DocumentEmailEvents.OwnerDocumentCompleted}
+            className="h-5 w-5"
+            checked={value.ownerDocumentCompleted}
+            onCheckedChange={(checked) =>
+              onChange({ ...value, [DocumentEmailEvents.OwnerDocumentCompleted]: Boolean(checked) })
+            }
+          />
 
-        <label
-          className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
-          htmlFor={DocumentEmailEvents.OwnerDocumentCompleted}
-        >
-          <Trans>Email the owner when the document is completed</Trans>
+          <label
+            className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
+            htmlFor={DocumentEmailEvents.OwnerDocumentCompleted}
+          >
+            <Trans>Email the owner when the document is completed</Trans>
 
-          <Tooltip>
-            <TooltipTrigger>
-              <InfoIcon className="mx-2 h-4 w-4" />
-            </TooltipTrigger>
+            <Tooltip>
+              <TooltipTrigger>
+                <InfoIcon className="mx-2 h-4 w-4" />
+              </TooltipTrigger>
 
-            <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
-              <h2>
-                <strong>
-                  <Trans>Document completed email</Trans>
-                </strong>
-              </h2>
+              <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
+                <h2>
+                  <strong>
+                    <Trans>Document completed email</Trans>
+                  </strong>
+                </h2>
 
-              <p>
-                <Trans>This will be sent to the document owner once the document has been fully completed.</Trans>
-              </p>
-            </TooltipContent>
-          </Tooltip>
-        </label>
-      </div>
+                <p>
+                  <Trans>This will be sent to the document owner once the document has been fully completed.</Trans>
+                </p>
+              </TooltipContent>
+            </Tooltip>
+          </label>
+        </div>
+      )}
 
-      <div className="flex flex-row items-center">
-        <Checkbox
-          id={DocumentEmailEvents.OwnerDocumentCreated}
-          className="h-5 w-5"
-          checked={value.ownerDocumentCreated}
-          onCheckedChange={(checked) =>
-            onChange({ ...value, [DocumentEmailEvents.OwnerDocumentCreated]: Boolean(checked) })
-          }
-        />
+      {!isHidden(DocumentEmailEvents.OwnerDocumentCreated) && (
+        <div className="flex flex-row items-center">
+          <Checkbox
+            id={DocumentEmailEvents.OwnerDocumentCreated}
+            className="h-5 w-5"
+            checked={value.ownerDocumentCreated}
+            onCheckedChange={(checked) =>
+              onChange({ ...value, [DocumentEmailEvents.OwnerDocumentCreated]: Boolean(checked) })
+            }
+          />
 
-        <label
-          className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
-          htmlFor={DocumentEmailEvents.OwnerDocumentCreated}
-        >
-          <Trans>Email the owner when a document is created from a direct template</Trans>
+          <label
+            className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
+            htmlFor={DocumentEmailEvents.OwnerDocumentCreated}
+          >
+            <Trans>Email the owner when a document is created from a direct template</Trans>
 
-          <Tooltip>
-            <TooltipTrigger>
-              <InfoIcon className="mx-2 h-4 w-4" />
-            </TooltipTrigger>
+            <Tooltip>
+              <TooltipTrigger>
+                <InfoIcon className="mx-2 h-4 w-4" />
+              </TooltipTrigger>
 
-            <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
-              <h2>
-                <strong>
-                  <Trans>Document created from direct template email</Trans>
-                </strong>
-              </h2>
+              <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
+                <h2>
+                  <strong>
+                    <Trans>Document created from direct template email</Trans>
+                  </strong>
+                </h2>
 
-              <p>
-                <Trans>
-                  This email is sent to the document owner when a recipient creates a document via a direct template
-                  link.
-                </Trans>
-              </p>
-            </TooltipContent>
-          </Tooltip>
-        </label>
-      </div>
+                <p>
+                  <Trans>
+                    This email is sent to the document owner when a recipient creates a document via a direct template
+                    link.
+                  </Trans>
+                </p>
+              </TooltipContent>
+            </Tooltip>
+          </label>
+        </div>
+      )}
 
-      <div className="flex flex-row items-center">
-        <Checkbox
-          id={DocumentEmailEvents.OwnerRecipientExpired}
-          className="h-5 w-5"
-          checked={value.ownerRecipientExpired}
-          onCheckedChange={(checked) =>
-            onChange({ ...value, [DocumentEmailEvents.OwnerRecipientExpired]: Boolean(checked) })
-          }
-        />
+      {!isHidden(DocumentEmailEvents.OwnerRecipientExpired) && (
+        <div className="flex flex-row items-center">
+          <Checkbox
+            id={DocumentEmailEvents.OwnerRecipientExpired}
+            className="h-5 w-5"
+            checked={value.ownerRecipientExpired}
+            onCheckedChange={(checked) =>
+              onChange({ ...value, [DocumentEmailEvents.OwnerRecipientExpired]: Boolean(checked) })
+            }
+          />
 
-        <label
-          className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
-          htmlFor={DocumentEmailEvents.OwnerRecipientExpired}
-        >
-          <Trans>Send recipient expired email to the owner</Trans>
+          <label
+            className="ml-2 flex flex-row items-center text-muted-foreground text-sm"
+            htmlFor={DocumentEmailEvents.OwnerRecipientExpired}
+          >
+            <Trans>Send recipient expired email to the owner</Trans>
 
-          <Tooltip>
-            <TooltipTrigger>
-              <InfoIcon className="mx-2 h-4 w-4" />
-            </TooltipTrigger>
+            <Tooltip>
+              <TooltipTrigger>
+                <InfoIcon className="mx-2 h-4 w-4" />
+              </TooltipTrigger>
 
-            <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
-              <h2>
-                <strong>
-                  <Trans>Recipient expired email</Trans>
-                </strong>
-              </h2>
+              <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
+                <h2>
+                  <strong>
+                    <Trans>Recipient expired email</Trans>
+                  </strong>
+                </h2>
 
-              <p>
-                <Trans>This will be sent to the document owner when a recipient's signing window has expired.</Trans>
-              </p>
-            </TooltipContent>
-          </Tooltip>
-        </label>
-      </div>
+                <p>
+                  <Trans>This will be sent to the document owner when a recipient's signing window has expired.</Trans>
+                </p>
+              </TooltipContent>
+            </Tooltip>
+          </label>
+        </div>
+      )}
     </div>
   );
 };