diff --git a/packages/admin-next/dashboard/src/routes/orders/order-receive-return/components/order-receive-return-form/constants.ts b/packages/admin-next/dashboard/src/routes/orders/order-receive-return/components/order-receive-return-form/constants.ts
index 1ff09a7ad7..eae4d8e6f4 100644
--- a/packages/admin-next/dashboard/src/routes/orders/order-receive-return/components/order-receive-return-form/constants.ts
+++ b/packages/admin-next/dashboard/src/routes/orders/order-receive-return/components/order-receive-return-form/constants.ts
@@ -3,8 +3,8 @@ import { z } from "zod"
 export const ReceiveReturnSchema = z.object({
   items: z.array(
     z.object({
-      quantity: z.number().nullable(),
-      dismissed_quantity: z.number().nullable(),
+      quantity: z.number().nullish(),
+      dismissed_quantity: z.number().nullish(),
       item_id: z.string(),
     })
   ),
diff --git a/packages/admin-next/dashboard/src/routes/orders/order-receive-return/order-receive-return.tsx b/packages/admin-next/dashboard/src/routes/orders/order-receive-return/order-receive-return.tsx
index 8c7421dbbf..c9240a49b6 100644
--- a/packages/admin-next/dashboard/src/routes/orders/order-receive-return/order-receive-return.tsx
+++ b/packages/admin-next/dashboard/src/routes/orders/order-receive-return/order-receive-return.tsx
@@ -48,7 +48,7 @@ export function OrderReceiveReturn() {
 
       if (preview.order_change) {
         if (preview.order_change.change_type !== "return_receive") {
-          navigate(`/orders/${order.id}`, { replace: true })
+          navigate(`/orders/${id}`, { replace: true })
           toast.error(t("orders.returns.activeChangeError"))
         }
         return