diff --git a/components/forms/SettingsSubmit.tsx b/components/forms/SettingsSubmit.tsx
index b1f8450d..298d4607 100644
--- a/components/forms/SettingsSubmit.tsx
+++ b/components/forms/SettingsSubmit.tsx
@@ -181,8 +181,8 @@ export default function SettingsSubmit({ mode = "create", submissionId, initialV
     handleSubmit,
     control,
     reset,
-    getValues,     // ⬅ added
-    setValue,      // ⬅ added
+    getValues,
+    setValue,
     formState: { isSubmitting },
   } = useForm<any>({
     defaultValues: {
@@ -216,6 +216,20 @@ export default function SettingsSubmit({ mode = "create", submissionId, initialV
   const lines = useFieldArray({ control, name: "line_settings" });
   const rasters = useFieldArray({ control, name: "raster_settings" });
 
+  // ⬇⬇⬇  Moved ABOVE the hydrate effect so they exist before being referenced
+  // Option lists (include current IDs to guarantee a visible option)
+  const mats = useOptions("material", initialValues?.mat ?? null);
+  const coats = useOptions("material_coating", initialValues?.mat_coat ?? null);
+  const colors = useOptions("material_color", initialValues?.mat_color ?? null);
+  const opacs = useOptions("material_opacity", initialValues?.mat_opacity ?? null);
+  const soft = useOptions("laser_software", initialValues?.laser_soft ?? null);
+  const srcs = useOptions("laser_source_co2_galvo", initialValues?.source ?? null);
+  const lens = useOptions("laser_scan_lens", initialValues?.lens ?? null);
+  const conf = useOptions("laser_scan_lens_config", initialValues?.lens_conf ?? null);
+  const apt = useOptions("laser_scan_lens_apt", initialValues?.lens_apt ?? null);
+  const exp = useOptions("laser_scan_lens_exp", initialValues?.lens_exp ?? null);
+  // ⬆⬆⬆
+
   // Prefill (edit)
   useEffect(() => {
     if (!isEdit || !initialValues) return;
@@ -280,18 +294,6 @@ export default function SettingsSubmit({ mode = "create", submissionId, initialV
     getValues, setValue,
   ]);
 
-  // Option lists (include current IDs to guarantee a visible option)
-  const mats = useOptions("material", initialValues?.mat ?? null);
-  const coats = useOptions("material_coating", initialValues?.mat_coat ?? null);
-  const colors = useOptions("material_color", initialValues?.mat_color ?? null);
-  const opacs = useOptions("material_opacity", initialValues?.mat_opacity ?? null);
-  const soft = useOptions("laser_software", initialValues?.laser_soft ?? null);
-  const srcs = useOptions("laser_source_co2_galvo", initialValues?.source ?? null);
-  const lens = useOptions("laser_scan_lens", initialValues?.lens ?? null);
-  const conf = useOptions("laser_scan_lens_config", initialValues?.lens_conf ?? null);
-  const apt = useOptions("laser_scan_lens_apt", initialValues?.lens_apt ?? null);
-  const exp = useOptions("laser_scan_lens_exp", initialValues?.lens_exp ?? null);
-
   // Image files
   const [photoFile, setPhotoFile] = useState<File | null>(null);
   const [screenFile, setScreenFile] = useState<File | null>(null);
@@ -449,15 +451,12 @@ export default function SettingsSubmit({ mode = "create", submissionId, initialV
         <Number label="Interval (mm)" name={`fill_settings.${i}.interval`} register={register} step="0.001" />
         <Number label="Pass" name={`fill_settings.${i}.pass`} register={register} step="1" />
         <Number label="Angle (°)" name={`fill_settings.${i}.angle`} register={register} step="1" />
-
-        {/* Move Auto first, then its increment in a half-width cell */}
         <Check label="Auto Rotate" name={`fill_settings.${i}.auto`} register={register} />
         {autoRotate && (
           <div className="md:col-span-2">
           <Number label="Auto Rotate Increment (°)" name={`fill_settings.${i}.increment`} register={register} step="0.001" />
           </div>
         )}
-
         <Check label="Crosshatch" name={`fill_settings.${i}.cross`} register={register} />
         <Check label="Flood Fill" name={`fill_settings.${i}.flood`} register={register} />
         <Check label="Air Assist" name={`fill_settings.${i}.air`} register={register} />
@@ -482,18 +481,14 @@ export default function SettingsSubmit({ mode = "create", submissionId, initialV
         <Number label="Pulse (ns)" name={`line_settings.${i}.pulse`} register={register} step="0.1" />
         <Number label="Power (%)" name={`line_settings.${i}.power`} register={register} step="0.1" />
         <Number label="Speed (mm/s)" name={`line_settings.${i}.speed`} register={register} step="0.1" />
-
-        {/* Pass before perf per your last request */}
         <Number label="Pass" name={`line_settings.${i}.pass`} register={register} step="1" />
         <Check label="Perforation Mode" name={`line_settings.${i}.perf`} register={register} />
-
         {perf && (
           <>
           <Number label="Cut (mm)" name={`line_settings.${i}.cut`} register={register} step="0.001" />
           <Number label="Skip (mm)" name={`line_settings.${i}.skip`} register={register} step="0.001" />
           </>
         )}
-
         <Check label="Wobble" name={`line_settings.${i}.wobble`} register={register} />
         {wobble && (
           <>
@@ -501,7 +496,6 @@ export default function SettingsSubmit({ mode = "create", submissionId, initialV
           <Number label="Size (mm)" name={`line_settings.${i}.size`} register={register} step="0.001" />
           </>
         )}
-
         <Check label="Air Assist" name={`line_settings.${i}.air`} register={register} />
         </div>
       );