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 1832feeb8..29830552e 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
@@ -145,7 +145,7 @@
                         address: {
                             billing: {
                                 address1: [''],
-
+                                save_as_address: false,
                                 use_for_shipping: true,
                             },
 
@@ -212,10 +212,15 @@
                             this.$validator.validateAll(scope)
                             .then(result => {
                                 if (result) {
-                                    this.$root.showLoader();
-
                                     switch (scope) {
                                         case 'address-form':
+                                            /* loader will activate only when save as address is clicked */
+                                            if (this.address.billing.save_as_address) {
+                                                this.$root.showLoader();
+                                            }
+
+                                            /* this is outside because save as address also calling for
+                                               saving the address in the order only */
                                             this.saveAddress();
                                             break;
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php
index 0b85780a7..bc1ee3876 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php
@@ -540,7 +540,5 @@
                     </span>
                 </span>
             </div>
-            @php
-            @endphp
         @endauth
     @endif
\ No newline at end of file