diff --git a/app/Http/Resources/CustomerResource.php b/app/Http/Resources/CustomerResource.php
index 118e52c..71626c1 100644
--- a/app/Http/Resources/CustomerResource.php
+++ b/app/Http/Resources/CustomerResource.php
@@ -21,17 +21,9 @@ public function toArray($request)
     {
         $shipping = $this->shippingAddress;
         $billing = $this->billingAddress;
-        return [
-            'id' => $this->user_id,
-            'first_name' => $this->first_name,
-            'last_name' => $this->last_name,
-            'email' => $this->user->email,
-            'phone' => $this->phone,
-            'status' => $this->status === CustomerStatus::Active->value,
-            'created_at' => (new \DateTime($this->created_at))->format('Y-m-d H:i:s'),
-            'updated_at' => (new \DateTime($this->updated_at))->format('Y-m-d H:i:s'),
 
-            'shippingAddress' => [
+        if($shipping) {
+            $shipping = [
                 'id' => $shipping->id,
                 'address1' => $shipping->address1,
                 'address2' => $shipping->address2,
@@ -39,8 +31,10 @@ public function toArray($request)
                 'state' => $shipping->state,
                 'zipcode' => $shipping->zipcode,
                 'country_code' => $shipping->country->code,
-            ],
-            'billingAddress' => [
+            ];
+        }
+        if($billing) {
+            $billing = [
                 'id' => $billing->id,
                 'address1' => $billing->address1,
                 'address2' => $billing->address2,
@@ -48,7 +42,21 @@ public function toArray($request)
                 'state' => $billing->state,
                 'zipcode' => $billing->zipcode,
                 'country_code' => $billing->country->code,
-            ]
+            ];
+        }
+
+        return [
+            'id' => $this->user_id,
+            'first_name' => $this->first_name,
+            'last_name' => $this->last_name,
+            'email' => $this->user->email,
+            'phone' => $this->phone,
+            'status' => $this->status === CustomerStatus::Active->value,
+            'created_at' => (new \DateTime($this->created_at))->format('Y-m-d H:i:s'),
+            'updated_at' => (new \DateTime($this->updated_at))->format('Y-m-d H:i:s'),
+
+            'shippingAddress' => $shipping,
+            'billingAddress' => $billing
         ];
     }
 }
diff --git a/backend/src/views/Customers/CustomerView.vue b/backend/src/views/Customers/CustomerView.vue
index ebf8f74..f29ac6c 100644
--- a/backend/src/views/Customers/CustomerView.vue
+++ b/backend/src/views/Customers/CustomerView.vue
@@ -14,7 +14,7 @@
           <div>
             <h2 class="text-xl font-semibold mt-6 pb-2 border-b border-gray-300">Billing Address</h2>
 
-            <div class="grid grid-cols-1 md:grid-cols-2 gap-2">
+            <div v-if="customer.billingAddress !== null" class="grid grid-cols-1 md:grid-cols-2 gap-2">
               <CustomInput v-model="customer.billingAddress.address1" label="Address 1"/>
               <CustomInput v-model="customer.billingAddress.address2" label="Address 2"/>
               <CustomInput v-model="customer.billingAddress.city" label="City"/>
@@ -26,12 +26,15 @@
               <CustomInput v-else type="select" :select-options="billingStateOptions"
                            v-model="customer.billingAddress.state" label="State"/>
             </div>
+            <p v-else class="text-center py-8 text-gray-700">
+              There are is no billing address
+            </p>
           </div>
 
           <div>
             <h2 class="text-xl font-semibold mt-6 pb-2 border-b border-gray-300">Shipping Address</h2>
 
-            <div class="grid grid-cols-1 md:grid-cols-2 gap-2">
+            <div v-if="customer.shippingAddress !== null" class="grid grid-cols-1 md:grid-cols-2 gap-2">
               <CustomInput v-model="customer.shippingAddress.address1" label="Address 1"/>
               <CustomInput v-model="customer.shippingAddress.address2" label="Address 2"/>
               <CustomInput v-model="customer.shippingAddress.city" label="City"/>
@@ -42,6 +45,9 @@
               <CustomInput v-else type="select" :select-options="shippingStateOptions"
                            v-model="customer.shippingAddress.state" label="State"/>
             </div>
+            <p v-else class="text-center py-8 text-gray-700">
+              There are is no shipping address
+            </p>
           </div>
         </div>