diff --git a/app/my/rigs/RigBuilderClient.tsx b/app/my/rigs/RigBuilderClient.tsx
index dc4f0d2a..340a3a31 100644
--- a/app/my/rigs/RigBuilderClient.tsx
+++ b/app/my/rigs/RigBuilderClient.tsx
@@ -319,14 +319,14 @@ export default function RigBuilderClient() {
         <div className="space-y-2">
         <label className="text-sm font-medium">LASER Source</label>
         <Select
-        value={watch("laser_source") ?? ""}
-        onValueChange={(v) => setValue("laser_source", v || null)}
+        value={watch("laser_source") ?? "none"}
+        onValueChange={(v) => setValue("laser_source", v === "none" ? null : v)}
         >
         <SelectTrigger>
         <SelectValue placeholder="Optional" />
         </SelectTrigger>
         <SelectContent className="max-h-64 overflow-y-auto">
-        <SelectItem value="">—</SelectItem>
+        <SelectItem value="none">—</SelectItem>
         {sourceOpts.map((o) => (
             <SelectItem key={o.id} value={String(o.id)}>
             {o.label}
@@ -340,14 +340,14 @@ export default function RigBuilderClient() {
         <div className="space-y-2">
         <label className="text-sm font-medium">LASER Software</label>
         <Select
-        value={watch("laser_software") ?? ""}
-        onValueChange={(v) => setValue("laser_software", v || null)}
+        value={watch("laser_software") ?? "none"}
+        onValueChange={(v) => setValue("laser_software", v === "none" ? null : v)}
         >
         <SelectTrigger>
         <SelectValue placeholder="Optional" />
         </SelectTrigger>
         <SelectContent className="max-h-64 overflow-y-auto">
-        <SelectItem value="">—</SelectItem>
+        <SelectItem value="none">—</SelectItem>
         {softwareOpts.map((o) => (
             <SelectItem key={o.id} value={String(o.id)}>
             {o.label}
@@ -369,14 +369,14 @@ export default function RigBuilderClient() {
             <div className="space-y-2">
             <label className="text-sm font-medium">LASER Focus Lens</label>
             <Select
-            value={watch("laser_focus_lens") ?? ""}
-            onValueChange={(v) => setValue("laser_focus_lens", v || null)}
+            value={watch("laser_focus_lens") ?? "none"}
+            onValueChange={(v) => setValue("laser_focus_lens", v === "none" ? null : v)}
             >
             <SelectTrigger>
             <SelectValue placeholder="Optional" />
             </SelectTrigger>
             <SelectContent className="max-h-64 overflow-y-auto">
-            <SelectItem value="">—</SelectItem>
+            <SelectItem value="none">—</SelectItem>
             {focusLensOpts.map((o) => (
                 <SelectItem key={o.id} value={String(o.id)}>
                 {o.label}
@@ -394,14 +394,14 @@ export default function RigBuilderClient() {
             <div className="space-y-2">
             <label className="text-sm font-medium">LASER Scan Lens</label>
             <Select
-            value={watch("laser_scan_lens") ?? ""}
-            onValueChange={(v) => setValue("laser_scan_lens", v || null)}
+            value={watch("laser_scan_lens") ?? "none"}
+            onValueChange={(v) => setValue("laser_scan_lens", v === "none" ? null : v)}
             >
             <SelectTrigger>
             <SelectValue placeholder="Optional" />
             </SelectTrigger>
             <SelectContent className="max-h-64 overflow-y-auto">
-            <SelectItem value="">—</SelectItem>
+            <SelectItem value="none">—</SelectItem>
             {scanLensOpts.map((o) => (
                 <SelectItem key={o.id} value={String(o.id)}>
                 {o.label}
@@ -414,14 +414,14 @@ export default function RigBuilderClient() {
             <div className="space-y-2">
             <label className="text-sm font-medium">Scan Lens Aperture</label>
             <Select
-            value={watch("laser_scan_lens_apt") ?? ""}
-            onValueChange={(v) => setValue("laser_scan_lens_apt", v || null)}
+            value={watch("laser_scan_lens_apt") ?? "none"}
+            onValueChange={(v) => setValue("laser_scan_lens_apt", v === "none" ? null : v)}
             >
             <SelectTrigger>
             <SelectValue placeholder="Optional" />
             </SelectTrigger>
             <SelectContent className="max-h-64 overflow-y-auto">
-            <SelectItem value="">—</SelectItem>
+            <SelectItem value="none">—</SelectItem>
             {/* These can be swapped to real options when you expose them as /api/options/... */}
             <SelectItem value="10mm">10 mm</SelectItem>
             <SelectItem value="14mm">14 mm</SelectItem>
@@ -434,14 +434,14 @@ export default function RigBuilderClient() {
             <div className="space-y-2">
             <label className="text-sm font-medium">Beam Expander</label>
             <Select
-            value={watch("laser_scan_lens_exp") ?? ""}
-            onValueChange={(v) => setValue("laser_scan_lens_exp", v || null)}
+            value={watch("laser_scan_lens_exp") ?? "none"}
+            onValueChange={(v) => setValue("laser_scan_lens_exp", v === "none" ? null : v)}
             >
             <SelectTrigger>
             <SelectValue placeholder="Optional" />
             </SelectTrigger>
             <SelectContent className="max-h-64 overflow-y-auto">
-            <SelectItem value="">—</SelectItem>
+            <SelectItem value="none">—</SelectItem>
             <SelectItem value="1.5x">1.5×</SelectItem>
             <SelectItem value="2x">2×</SelectItem>
             <SelectItem value="3x">3×</SelectItem>