diff --git a/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx b/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx
index 17b5ea191af..ac58393ed77 100644
--- a/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx
+++ b/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx
@@ -141,6 +141,7 @@ const OrderShippingMethodEditDialog: React.FC<OrderShippingMethodEditDialogProps
                 color="primary"
                 variant="contained"
                 type="submit"
+                disabled={!data.shippingMethod}
               >
                 <FormattedMessage {...buttonMessages.confirm} />
               </ConfirmButton>