diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php
index 769fb1bd2..e966b22db 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php
@@ -369,7 +369,6 @@
 
                                 shippingMethods = response.data.shippingMethods;
 
-                                this.validateForm('shipping-form');
                                 this.getOrderSummary();
                             })
                             .catch(error => {
@@ -388,6 +387,8 @@
 
                                 this.showPaymentSection = true;
 
+                                document.body.style.cursor = 'default';
+
                                 paymentHtml = Vue.compile(response.data.html)
 
                                 this.completed_step = this.step_numbers[response.data.jump_to_section] + 1;
@@ -400,7 +401,6 @@
                                     this.savePayment();
                                 }
 
-                                this.validateForm('payment-form');
                                 this.getOrderSummary();
                             })
                             .catch(error => {
@@ -422,6 +422,7 @@
                                 this.disable_button = false;
 
                                 this.showSummarySection = true;
+                                document.body.style.cursor = 'default';
 
                                 reviewHtml = Vue.compile(response.data.html)
                                 this.completed_step = this.step_numbers[response.data.jump_to_section] + 1;
@@ -526,20 +527,8 @@
                 staticRenderFns: shippingTemplateRenderFns,
 
                 mounted: function () {
-                    for (method in shippingMethods) {
-                        if (this.first_iteration) {
-
-                            for (rate in shippingMethods[method]['rates']) {
-                                this.selected_shipping_method = shippingMethods[method]['rates'][rate]['method'];
-
-                                this.first_iteration = false;
-
-                                this.methodSelected();
-                            }
-                        }
-                    }
-
                     this.templateRender = shippingHtml.render;
+
                     for (var i in shippingHtml.staticRenderFns) {
                         shippingTemplateRenderFns.push(shippingHtml.staticRenderFns[i]);
                     }
@@ -584,15 +573,8 @@
                 staticRenderFns: paymentTemplateRenderFns,
 
                 mounted: function () {
-                    for (method in paymentMethods) {
-                        if (this.first_iteration) {
-                            this.payment.method = paymentMethods[method]['method'];
-                            this.first_iteration = false;
-                            this.methodSelected();
-                        }
-                    }
-
                     this.templateRender = paymentHtml.render;
+
                     for (var i in paymentHtml.staticRenderFns) {
                         paymentTemplateRenderFns.push(paymentHtml.staticRenderFns[i]);
                     }
@@ -707,6 +689,7 @@
                     },
                 }
             });
+
         })()
     </script>
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/shipping.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/shipping.blade.php
index e7ce1530e..044e8bd91 100755
--- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/shipping.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/shipping.blade.php
@@ -18,14 +18,14 @@
                                 <div>
                                     <label class="radio-container">
                                         <input
-                                            v-validate="'required'"
                                             type="radio"
-                                            id="{{ $rate->method }}"
+                                            v-validate="'required'"
                                             name="shipping_method"
-                                            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.shipping-method') }}&quot;"
+                                            id="{{ $rate->method }}"
                                             value="{{ $rate->method }}"
+                                            @change="methodSelected()"
                                             v-model="selected_shipping_method"
-                                            @change="methodSelected()" />
+                                            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.shipping-method') }}&quot;" />
 
                                         <span class="checkmark"></span>
                                     </label>