diff --git a/packages/ui/src/components/products/create.tsx b/packages/ui/src/components/products/create.tsx
index 56fa962..5d3ddc2 100644
--- a/packages/ui/src/components/products/create.tsx
+++ b/packages/ui/src/components/products/create.tsx
@@ -55,9 +55,9 @@ const productFields: FormField[] = [
 export interface ProductCreateData extends FormData {
 	name: string;
 	price: number;
-	description?: string | null;
-	imageUrl?: string | null;
-	isPublished?: boolean | null;
+	description: string;
+	imageUrl: string;
+	isPublished: boolean;
 }
 
 interface ProductCreateProps {
@@ -80,8 +80,8 @@ export function ProductCreate({
 		const productData: ProductCreateData = {
 			name: data.name as string,
 			price: Number(data.price),
-			description: (data.description as string) || null,
-			imageUrl: (data.imageUrl as string) || null,
+			description: data.description as string,
+			imageUrl: data.imageUrl as string,
 			isPublished: data.isPublished ? Boolean(data.isPublished) : false,
 		};
 
diff --git a/packages/ui/src/components/template/create-form.tsx b/packages/ui/src/components/template/create-form.tsx
index e170522..f4323ba 100644
--- a/packages/ui/src/components/template/create-form.tsx
+++ b/packages/ui/src/components/template/create-form.tsx
@@ -196,7 +196,7 @@ export function CreateForm({
 				return (
 					<textarea
 						className={baseInputClasses}
-						value={formData[field.key] || ""}
+						value={String(formData[field.key] || "")}
 						onChange={(e) =>
 							handleInputChange(field.key, e.target.value)
 						}
@@ -210,7 +210,7 @@ export function CreateForm({
 				return (
 					<select
 						className={baseInputClasses}
-						value={formData[field.key] || ""}
+						value={String(formData[field.key] || "")}
 						onChange={(e) =>
 							handleInputChange(field.key, e.target.value)
 						}
@@ -233,7 +233,7 @@ export function CreateForm({
 						<input
 							type="checkbox"
 							className="h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded"
-							checked={formData[field.key] || false}
+							checked={Boolean(formData[field.key])}
 							onChange={(e) =>
 								handleInputChange(field.key, e.target.checked)
 							}
@@ -250,7 +250,11 @@ export function CreateForm({
 					<input
 						type="number"
 						className={baseInputClasses}
-						value={formData[field.key] || ""}
+						value={
+							typeof formData[field.key] === "number"
+								? String(formData[field.key])
+								: ""
+						}
 						onChange={(e) =>
 							handleInputChange(
 								field.key,
@@ -270,7 +274,7 @@ export function CreateForm({
 					<input
 						type={field.type}
 						className={baseInputClasses}
-						value={formData[field.key] || ""}
+						value={String(formData[field.key] || "")}
 						onChange={(e) =>
 							handleInputChange(field.key, e.target.value)
 						}