diff --git a/src/domain/work-orders/mappers/expand-scalar-board-ops.ts b/src/domain/work-orders/mappers/expand-scalar-board-ops.ts
index c5d93668..522bca7e 100644
--- a/src/domain/work-orders/mappers/expand-scalar-board-ops.ts
+++ b/src/domain/work-orders/mappers/expand-scalar-board-ops.ts
@@ -22,6 +22,12 @@ type ScalarBoardOpRule = {
 /** One row per scalar patch field, in emission order. */
 const SCALAR_BOARD_OP_RULES: ScalarBoardOpRule[] = [
   { key: "woNumber", field: "woNumber", toValue: (value) => value as string },
+  // Severity before type so Emergency/Reactive never land without required severity.
+  {
+    key: "severity",
+    field: "severity",
+    toValue: (value) => (value == null ? "" : String(value)),
+  },
   { key: "type", field: "workOrderType", toValue: (value) => value as string },
   { key: "site", field: "siteCode", toValue: (value) => value as string },
   { key: "status", field: "lifecycleStatus", toValue: (value) => value as string },
@@ -34,11 +40,6 @@ const SCALAR_BOARD_OP_RULES: ScalarBoardOpRule[] = [
   { key: "extraServices", field: "extraServices", toValue: (value) => JSON.stringify(value) },
   { key: "serviceNotes", field: "serviceNotes", toValue: (value) => value as string },
   { key: "flagColor", field: "flagColor", toValue: (value) => (value as string | null) ?? "" },
-  {
-    key: "severity",
-    field: "severity",
-    toValue: (value) => (value == null ? "" : String(value)),
-  },
 ];
 
 export function expandScalarBoardOps(patch: WorkOrderTablePatch): BoardFieldOp[] {