diff --git a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
index bab099177..301592614 100644
--- a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
@@ -136,12 +136,12 @@ class AddressController extends Controller
      * @return Mixed | @return response
      */
     public function makeDefault($id) {
-        $default = $this->customer->defaultAddress;
-
-        $result = $this->address->find($default->id)->update(['default_address' => 0]);
-
-        if($this->address->find($id)->update(['default_address' => 1])) {
+        if($default = $this->customer->default_address) {
+            $this->address->find($default->id)->update(['default_address' => 0]);
+        }
 
+        if($address = $this->address->find($id)) {
+            $address->update(['default_address' => 1]);
         } else {
             session()->flash('success', 'Default Cannot Be Address Changed');
         }
diff --git a/packages/Webkul/Customer/src/Models/Customer.php b/packages/Webkul/Customer/src/Models/Customer.php
index 5ac75a876..1c2079228 100644
--- a/packages/Webkul/Customer/src/Models/Customer.php
+++ b/packages/Webkul/Customer/src/Models/Customer.php
@@ -58,7 +58,7 @@ class Customer extends Authenticatable
     /**
      * Get default customer address that owns the customer.
      */
-    public function defaultAddress()
+    public function default_address()
     {
         return $this->hasOne(CustomerAddress::class, 'customer_id')->where('default_address', 1);
     }
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
index fac86872c..d363d5feb 100644
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
@@ -119,8 +119,8 @@
         var summaryHtml = Vue.compile(`<?php echo view('shop::checkout.total.summary', ['cart' => $cart])->render(); ?>`);
         var customerAddress = null;
         @auth('customer')
-            @if(auth('customer')->user()->address)
-                customerAddress = @json(auth('customer')->user()->address);
+            @if(auth('customer')->user()->default_address)
+                customerAddress = @json(auth('customer')->user()->default_address);
             @else
                 customerAddress = {};
             @endif