diff --git a/apps/api/src/services/CampaignService.ts b/apps/api/src/services/CampaignService.ts
index 0f46daa..7e8dfde 100644
--- a/apps/api/src/services/CampaignService.ts
+++ b/apps/api/src/services/CampaignService.ts
@@ -22,8 +22,8 @@ export interface CreateCampaignData {
   subject: string;
   body: string;
   from: string;
-  fromName?: string;
-  replyTo?: string;
+  fromName?: string | null;
+  replyTo?: string | null;
   audienceType: CampaignAudienceType;
   audienceCondition?: FilterCondition;
   segmentId?: string;
@@ -35,8 +35,8 @@ export interface UpdateCampaignData {
   subject?: string;
   body?: string;
   from?: string;
-  fromName?: string;
-  replyTo?: string;
+  fromName?: string | null;
+  replyTo?: string | null;
   audienceType?: CampaignAudienceType;
   audienceCondition?: FilterCondition;
   segmentId?: string;
diff --git a/apps/api/src/services/TemplateService.ts b/apps/api/src/services/TemplateService.ts
index 9e4fad4..5b7d544 100644
--- a/apps/api/src/services/TemplateService.ts
+++ b/apps/api/src/services/TemplateService.ts
@@ -88,8 +88,8 @@ export class TemplateService {
       subject: string;
       body: string;
       from: string;
-      fromName?: string;
-      replyTo?: string;
+      fromName?: string | null;
+      replyTo?: string | null;
       type?: Template['type'];
     },
   ): Promise<Template> {
@@ -120,8 +120,8 @@ export class TemplateService {
       subject?: string;
       body?: string;
       from?: string;
-      fromName?: string;
-      replyTo?: string;
+      fromName?: string | null;
+      replyTo?: string | null;
       type?: Template['type'];
     },
   ): Promise<Template> {
diff --git a/apps/api/src/utils/modelUpdate.ts b/apps/api/src/utils/modelUpdate.ts
index 919aea7..7e3390b 100644
--- a/apps/api/src/utils/modelUpdate.ts
+++ b/apps/api/src/utils/modelUpdate.ts
@@ -34,8 +34,8 @@ export function buildEmailFieldsUpdate(data: {
   subject?: string;
   body?: string;
   from?: string;
-  fromName?: string;
-  replyTo?: string;
+  fromName?: string | null;
+  replyTo?: string | null;
 }): Prisma.CampaignUpdateInput | Prisma.TemplateUpdateInput {
   return buildUpdateData(data) as Prisma.CampaignUpdateInput | Prisma.TemplateUpdateInput;
 }
diff --git a/apps/web/src/pages/campaigns/[id].tsx b/apps/web/src/pages/campaigns/[id].tsx
index 88bc4ba..bfe7930 100644
--- a/apps/web/src/pages/campaigns/[id].tsx
+++ b/apps/web/src/pages/campaigns/[id].tsx
@@ -213,8 +213,8 @@ export default function CampaignDetailsPage() {
         subject: editedCampaign.subject,
         body: editedCampaign.body,
         from: editedCampaign.from,
-        fromName: editedCampaign.fromName || undefined,
-        replyTo: editedCampaign.replyTo || undefined,
+        fromName: editedCampaign.fromName || null,
+        replyTo: editedCampaign.replyTo || null,
         audienceType: editedCampaign.audienceType,
         segmentId: editedCampaign.segmentId || undefined,
       });
diff --git a/apps/web/src/pages/campaigns/create.tsx b/apps/web/src/pages/campaigns/create.tsx
index bc30a85..c3aeef8 100644
--- a/apps/web/src/pages/campaigns/create.tsx
+++ b/apps/web/src/pages/campaigns/create.tsx
@@ -64,8 +64,8 @@ export default function CreateCampaignPage() {
         subject,
         body,
         from,
-        fromName: fromName || undefined,
-        replyTo: replyTo || undefined,
+        fromName: fromName || null,
+        replyTo: replyTo || null,
         audienceType,
         segmentId: audienceType === CampaignAudienceType.SEGMENT ? segmentId : undefined,
         audienceFilter: audienceType === CampaignAudienceType.FILTERED ? [] : undefined,
diff --git a/apps/web/src/pages/templates/[id].tsx b/apps/web/src/pages/templates/[id].tsx
index 3d950b1..fd21b70 100644
--- a/apps/web/src/pages/templates/[id].tsx
+++ b/apps/web/src/pages/templates/[id].tsx
@@ -93,8 +93,8 @@ export default function TemplateEditorPage() {
         subject: editedTemplate.subject,
         body: editedTemplate.body,
         from: editedTemplate.from,
-        fromName: editedTemplate.fromName || undefined,
-        replyTo: editedTemplate.replyTo || undefined,
+        fromName: editedTemplate.fromName || null,
+        replyTo: editedTemplate.replyTo || null,
         type: editedTemplate.type,
       });
 
diff --git a/apps/web/src/pages/templates/create.tsx b/apps/web/src/pages/templates/create.tsx
index b75e8f2..576be7b 100644
--- a/apps/web/src/pages/templates/create.tsx
+++ b/apps/web/src/pages/templates/create.tsx
@@ -58,8 +58,8 @@ export default function CreateTemplatePage() {
         subject,
         body,
         from,
-        fromName: fromName || undefined,
-        replyTo: replyTo || undefined,
+        fromName: fromName || null,
+        replyTo: replyTo || null,
         type,
       });
 
diff --git a/packages/shared/src/schemas/index.ts b/packages/shared/src/schemas/index.ts
index 181b7c9..74ef852 100644
--- a/packages/shared/src/schemas/index.ts
+++ b/packages/shared/src/schemas/index.ts
@@ -142,8 +142,8 @@ export const TemplateSchemas = {
     subject: z.string().min(1),
     body: z.string().min(1),
     from: email,
-    fromName: z.string().max(100).optional(),
-    replyTo: email.optional(),
+    fromName: z.string().max(100).nullish(),
+    replyTo: email.nullish(),
     type: z.nativeEnum(TemplateType).default('MARKETING'),
   }),
   update: z.object({
@@ -152,8 +152,8 @@ export const TemplateSchemas = {
     subject: z.string().min(1).optional(),
     body: z.string().min(1).optional(),
     from: email.optional(),
-    fromName: z.string().max(100).optional(),
-    replyTo: email.optional(),
+    fromName: z.string().max(100).nullish(),
+    replyTo: email.nullish(),
     type: z.nativeEnum(TemplateType).optional(),
   }),
 };
@@ -282,8 +282,8 @@ export const CampaignSchemas = {
     subject: z.string().min(1),
     body: z.string().min(1),
     from: email,
-    fromName: z.string().max(100).optional(),
-    replyTo: email.optional(),
+    fromName: z.string().max(100).nullish(),
+    replyTo: email.nullish(),
     audienceType: z.nativeEnum(CampaignAudienceType),
     audienceCondition: filterConditionSchema.optional(),
     segmentId: uuid.optional(),
@@ -297,8 +297,8 @@ export const CampaignSchemas = {
     subject: z.string().optional(),
     body: z.string().optional(),
     from: z.string().optional(),
-    fromName: z.string().max(100).optional(),
-    replyTo: z.string().optional(),
+    fromName: z.string().max(100).nullish(),
+    replyTo: z.string().nullish(),
     audienceType: z.nativeEnum(CampaignAudienceType).optional(),
     audienceCondition: filterConditionSchema.optional(),
     segmentId: z.string().optional(),