diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php
index 7812df479..6eea8120e 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php
@@ -107,41 +107,45 @@
                                         </div>
                                     </div>
                                 </div>
-                            </div>                          
+                            </div>
                         </div>
                     </accordian>
 
-                    <accordian title="{{ __('admin::app.sales.orders.address') }}" :active="true">
-                        <div slot="body">
-                            <div class="sale">
-                                <div class="sale-section">
-                                    <div class="secton-title">
-                                        <span>{{ __('admin::app.sales.orders.billing-address') }}</span>
-                                    </div>
+                    @if ($order->billing_address || $order->shipping_address)
+                        <accordian title="{{ __('admin::app.sales.orders.address') }}" :active="true">
+                            <div slot="body">
+                                <div class="sale">
+                                    @if ($order->billing_address)
+                                        <div class="sale-section">
+                                            <div class="secton-title">
+                                                <span>{{ __('admin::app.sales.orders.billing-address') }}</span>
+                                            </div>
 
-                                    <div class="section-content">
+                                            <div class="section-content">
 
-                                        @include ('admin::sales.address', ['address' => $order->billing_address])
+                                                @include ('admin::sales.address', ['address' => $order->billing_address])
 
-                                    </div>
+                                            </div>
+                                        </div>
+                                    @endif
+
+                                    @if ($order->shipping_address)
+                                        <div class="sale-section">
+                                            <div class="secton-title">
+                                                <span>{{ __('admin::app.sales.orders.shipping-address') }}</span>
+                                            </div>
+
+                                            <div class="section-content">
+
+                                                @include ('admin::sales.address', ['address' => $order->shipping_address])
+
+                                            </div>
+                                        </div>
+                                    @endif
                                 </div>
-
-                                @if ($order->shipping_address)
-                                    <div class="sale-section">
-                                        <div class="secton-title">
-                                            <span>{{ __('admin::app.sales.orders.shipping-address') }}</span>
-                                        </div>
-
-                                        <div class="section-content">
-
-                                            @include ('admin::sales.address', ['address' => $order->shipping_address])
-
-                                        </div>
-                                    </div>
-                                @endif
-                            </div>                            
-                        </div>
-                    </accordian>
+                            </div>
+                        </accordian>
+                    @endif
 
                     <accordian title="{{ __('admin::app.sales.orders.payment-and-shipping') }}" :active="true">
                         <div slot="body">
@@ -273,7 +277,7 @@
 
                                         </tbody>
                                     </table>
-                                </div>                                
+                                </div>
                             </div>
                         </div>
                     </accordian>
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
index 94d765c30..2bd2bfcc8 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
@@ -106,42 +106,46 @@
                                         </div>
                                     </div>
                                 </div>
-                            </div>                            
-                        </div>
-                    </accordian>
-
-                    <accordian title="{{ __('admin::app.sales.orders.address') }}" :active="true">
-                        <div slot="body">
-                            <div class="sale">
-                                <div class="sale-section">
-                                    <div class="secton-title">
-                                        <span>{{ __('admin::app.sales.orders.billing-address') }}</span>
-                                    </div>
-
-                                    <div class="section-content">
-
-                                        @include ('admin::sales.address', ['address' => $order->billing_address])
-
-                                    </div>
-                                </div>
-
-                                @if ($order->shipping_address)
-                                    <div class="sale-section">
-                                        <div class="secton-title">
-                                            <span>{{ __('admin::app.sales.orders.shipping-address') }}</span>
-                                        </div>
-
-                                        <div class="section-content">
-
-                                            @include ('admin::sales.address', ['address' => $order->shipping_address])
-
-                                        </div>
-                                    </div>
-                                @endif
                             </div>
                         </div>
                     </accordian>
 
+                    @if ($order->billing_address || $order->shipping_address)
+                        <accordian title="{{ __('admin::app.sales.orders.address') }}" :active="true">
+                            <div slot="body">
+                                <div class="sale">
+                                    @if ($order->billing_address)
+                                        <div class="sale-section">
+                                            <div class="secton-title">
+                                                <span>{{ __('admin::app.sales.orders.billing-address') }}</span>
+                                            </div>
+
+                                            <div class="section-content">
+
+                                                @include ('admin::sales.address', ['address' => $order->billing_address])
+
+                                            </div>
+                                        </div>
+                                    @endif
+
+                                    @if ($order->shipping_address)
+                                        <div class="sale-section">
+                                            <div class="secton-title">
+                                                <span>{{ __('admin::app.sales.orders.shipping-address') }}</span>
+                                            </div>
+
+                                            <div class="section-content">
+
+                                                @include ('admin::sales.address', ['address' => $order->shipping_address])
+
+                                            </div>
+                                        </div>
+                                    @endif
+                                </div>
+                            </div>
+                        </accordian>
+                    @endif
+
                     <accordian title="{{ __('admin::app.sales.orders.payment-and-shipping') }}" :active="true">
                         <div slot="body">
                             <div class="sale">
@@ -340,7 +344,7 @@
 
                         </tbody>
                     </table>
-                </div>            
+                </div>
             </div>
         </div>
     </script>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
index 474c0875c..939d3745a 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
@@ -208,18 +208,20 @@
 
                         <tbody>
                             <tr>
-                                <td>
-                                    <p>{{ $invoice->order->billing_address->company_name ?? '' }}</p>
-                                    <p>{{ $invoice->order->billing_address->name }}</p>
-                                    <p>{{ $invoice->order->billing_address->address1 }}</p>
-                                    <p>{{ $invoice->order->billing_address->city }}</p>
-                                    <p>{{ $invoice->order->billing_address->state }}</p>
-                                    <p>
-                                        {{ core()->country_name($invoice->order->billing_address->country) }}
-                                        {{ $invoice->order->billing_address->postcode }}
-                                    </p>
-                                    {{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->billing_address->phone }}
-                                </td>
+                                @if ($invoice->order->billing_address)
+                                    <td>
+                                        <p>{{ $invoice->order->billing_address->company_name ?? '' }}</p>
+                                        <p>{{ $invoice->order->billing_address->name }}</p>
+                                        <p>{{ $invoice->order->billing_address->address1 }}</p>
+                                        <p>{{ $invoice->order->billing_address->city }}</p>
+                                        <p>{{ $invoice->order->billing_address->state }}</p>
+                                        <p>
+                                            {{ core()->country_name($invoice->order->billing_address->country) }}
+                                            {{ $invoice->order->billing_address->postcode }}
+                                        </p>
+                                        {{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->billing_address->phone }}
+                                    </td>
+                                @endif
 
                                 @if ($invoice->order->shipping_address)
                                     <td>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
index 18c8fc9d9..29f7eee30 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
@@ -136,7 +136,7 @@
                                     </table>
                                 </div>
                             </div>
-                            
+
 
                             <div class="totals">
                                 <table class="sale-summary">
@@ -271,7 +271,7 @@
                                                     @endforeach
                                                 </tbody>
                                             </table>
-                                        </div>                                          
+                                        </div>
                                     </div>
 
                                     <div class="totals">
@@ -360,7 +360,7 @@
                                                     @endforeach
                                                 </tbody>
                                             </table>
-                                        </div>                                        
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -474,17 +474,19 @@
             <div class="sale-section">
                 <div class="section-content" style="border-bottom: 0">
                     <div class="order-box-container">
-                        <div class="box">
-                            <div class="box-title">
-                                {{ __('shop::app.customer.account.order.view.billing-address') }}
-                            </div>
+                        @if ($order->billing_address)
+                            <div class="box">
+                                <div class="box-title">
+                                    {{ __('shop::app.customer.account.order.view.billing-address') }}
+                                </div>
 
-                            <div class="box-content">
-                                @include ('admin::sales.address', ['address' => $order->billing_address])
+                                <div class="box-content">
+                                    @include ('admin::sales.address', ['address' => $order->billing_address])
 
-                                {!! view_render_event('bagisto.shop.customers.account.orders.view.billing-address.after', ['order' => $order]) !!}
+                                    {!! view_render_event('bagisto.shop.customers.account.orders.view.billing-address.after', ['order' => $order]) !!}
+                                </div>
                             </div>
-                        </div>
+                        @endif
 
                         @if ($order->shipping_address)
                             <div class="box">
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php
index 70acf516b..dcbac8acf 100644
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php
@@ -79,58 +79,60 @@
                 </div>
             @endif
 
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.billing-address') }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->address1 }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->postcode . " " . $order->billing_address->city }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->billing_address->country) }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
-                </div>
-
-                <div style="font-size: 16px; color: #242424;">
-                    {{ __('shop::app.mail.order.payment') }}
-                </div>
-
-                <div style="font-weight: bold; font-size: 16px; color: #242424; margin-bottom: 20px;">
-                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
-                </div>
-
-                @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp
-
-                @if (! empty($additionalDetails))
-                    <div style="font-size: 16px; color: #242424;">
-                        <div>{{ $additionalDetails['title'] }}</div>
-                        <div>{{ $additionalDetails['value'] }}</div>
+            @if ($order->billing_address)
+                <div style="line-height: 25px;">
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.billing-address') }}
                     </div>
-                @endif
-            </div>
+
+                    <div>
+                        {{ $order->billing_address->company_name ?? '' }}
+                    </div>
+
+                    <div>
+                        {{ $order->billing_address->name }}
+                    </div>
+
+                    <div>
+                        {{ $order->billing_address->address1 }}
+                    </div>
+
+                    <div>
+                        {{ $order->billing_address->postcode . " " . $order->billing_address->city }}
+                    </div>
+
+                    <div>
+                        {{ $order->billing_address->state }}
+                    </div>
+
+                    <div>
+                        {{ core()->country_name($order->billing_address->country) }}
+                    </div>
+
+                    <div>---</div>
+
+                    <div style="margin-bottom: 40px;">
+                        {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
+                    </div>
+
+                    <div style="font-size: 16px; color: #242424;">
+                        {{ __('shop::app.mail.order.payment') }}
+                    </div>
+
+                    <div style="font-weight: bold; font-size: 16px; color: #242424; margin-bottom: 20px;">
+                        {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                    </div>
+
+                    @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp
+
+                    @if (! empty($additionalDetails))
+                        <div style="font-size: 16px; color: #242424;">
+                            <div>{{ $additionalDetails['title'] }}</div>
+                            <div>{{ $additionalDetails['value'] }}</div>
+                        </div>
+                    @endif
+                </div>
+            @endif
         </div>
 
         <div class="section-content">
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php
index aa6849768..2996071ac 100644
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php
@@ -34,103 +34,107 @@
 
 
         <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.shipping-address') }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->address1 }}
-                </div>
-                    
-                <div>
-                    {{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
-                </div>
-                    
-                <div>
-                    {{ $order->shipping_address->state }}
-                </div>
-                    
-                <div>
-                    {{ core()->country_name($order->shipping_address->country) }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
-                </div>
-
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.shipping') }}
-                </div>
-
-                <div style="font-size: 16px;color: #242424;">
-                    <div style="font-weight: bold;">
-                        {{ $order->shipping_title }}
+            @if ($order->shipping_address)
+                <div style="line-height: 25px;">
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.shipping-address') }}
                     </div>
 
-                    <div style="margin-top: 5px;">
-                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.carrier') }} : </span>{{ $shipment->carrier_title }}
+                    <div>
+                        {{ $order->shipping_address->company_name ?? '' }}
                     </div>
 
-                    <div style="margin-top: 5px;">
-                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.tracking-number') }} : </span>{{ $shipment->track_number }}
+                    <div>
+                        {{ $order->shipping_address->name }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->address1 }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->state }}
+                    </div>
+
+                    <div>
+                        {{ core()->country_name($order->shipping_address->country) }}
+                    </div>
+
+                    <div>---</div>
+
+                    <div style="margin-bottom: 40px;">
+                        {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
+                    </div>
+
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.shipping') }}
+                    </div>
+
+                    <div style="font-size: 16px;color: #242424;">
+                        <div style="font-weight: bold;">
+                            {{ $order->shipping_title }}
+                        </div>
+
+                        <div style="margin-top: 5px;">
+                            <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.carrier') }} : </span>{{ $shipment->carrier_title }}
+                        </div>
+
+                        <div style="margin-top: 5px;">
+                            <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.tracking-number') }} : </span>{{ $shipment->track_number }}
+                        </div>
                     </div>
                 </div>
-            </div>
+            @endif
 
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.billing-address') }}
-                </div>
+            @if ($order->billing_address)
+                <div style="line-height: 25px;">
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.billing-address') }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->company_name ?? '' }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->company_name ?? '' }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->name }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->name }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->address1 }}
-                </div>
-                    
-                <div>
-                    {{ $order->billing_address->postcode . " " . $order->billing_address->city }}
-                </div>
-                    
-                <div>
-                    {{ $order->billing_address->state }}
-                </div>
-                    
-                <div>
-                    {{ core()->country_name($order->billing_address->country) }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->address1 }}
+                    </div>
 
-                <div>---</div>
+                    <div>
+                        {{ $order->billing_address->postcode . " " . $order->billing_address->city }}
+                    </div>
 
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->state }}
+                    </div>
 
-                <div style="font-weight: bold; font-size: 16px; color: #242424;">
-                    {{ __('shop::app.mail.order.payment') }}
-                </div>
+                    <div>
+                        {{ core()->country_name($order->billing_address->country) }}
+                    </div>
 
-                <div style="font-weight: bold; font-size: 16px; color: #242424;">
-                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                    <div>---</div>
+
+                    <div style="margin-bottom: 40px;">
+                        {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
+                    </div>
+
+                    <div style="font-weight: bold; font-size: 16px; color: #242424;">
+                        {{ __('shop::app.mail.order.payment') }}
+                    </div>
+
+                    <div style="font-weight: bold; font-size: 16px; color: #242424;">
+                        {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                    </div>
                 </div>
-            </div>
+            @endif
         </div>
 
         <div class="section-content">
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php
index f19247178..73102da0f 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php
@@ -78,49 +78,51 @@
                 </div>
             @endif
 
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.billing-address') }}
-                </div>
+            @if ($order->billing_address)
+                <div style="line-height: 25px;">
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.billing-address') }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->company_name ?? '' }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->company_name ?? '' }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->name }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->name }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->address1 }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->address1 }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->postcode . " " . $order->billing_address->city }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->postcode . " " . $order->billing_address->city }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->state }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->state }}
+                    </div>
 
-                <div>
-                    {{ core()->country_name($order->billing_address->country) }}
-                </div>
+                    <div>
+                        {{ core()->country_name($order->billing_address->country) }}
+                    </div>
 
-                <div>---</div>
+                    <div>---</div>
 
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
-                </div>
+                    <div style="margin-bottom: 40px;">
+                        {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
+                    </div>
 
-                <div style="font-size: 16px; color: #242424;">
-                    {{ __('shop::app.mail.order.payment') }}
-                </div>
+                    <div style="font-size: 16px; color: #242424;">
+                        {{ __('shop::app.mail.order.payment') }}
+                    </div>
 
-                <div style="font-weight: bold;font-size: 16px; color: #242424;">
-                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                    <div style="font-weight: bold;font-size: 16px; color: #242424;">
+                        {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                    </div>
                 </div>
-            </div>
+            @endif
         </div>
 
         <div class="section-content">
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php
index e6021ee94..8fc385165 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php
@@ -75,58 +75,60 @@
                 </div>
             @endif
 
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.billing-address') }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->address1 }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->postcode ." " . $order->billing_address->city }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->billing_address->country) }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
-                </div>
-
-                <div style="font-size: 16px; color: #242424;">
-                    {{ __('shop::app.mail.order.payment') }}
-                </div>
-
-                <div style="font-weight: bold; font-size: 16px; color: #242424; margin-bottom: 20px;">
-                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
-                </div>
-
-                @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp
-
-                @if (! empty($additionalDetails))
-                    <div style="font-size: 16px; color: #242424;">
-                        <div>{{ $additionalDetails['title'] }}</div>
-                        <div>{{ $additionalDetails['value'] }}</div>
+            @if ($order->billing_address)
+                <div style="line-height: 25px;">
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.billing-address') }}
                     </div>
-                @endif
-            </div>
+
+                    <div>
+                        {{ $order->billing_address->company_name ?? '' }}
+                    </div>
+
+                    <div>
+                        {{ $order->billing_address->name }}
+                    </div>
+
+                    <div>
+                        {{ $order->billing_address->address1 }}
+                    </div>
+
+                    <div>
+                        {{ $order->billing_address->postcode ." " . $order->billing_address->city }}
+                    </div>
+
+                    <div>
+                        {{ $order->billing_address->state }}
+                    </div>
+
+                    <div>
+                        {{ core()->country_name($order->billing_address->country) }}
+                    </div>
+
+                    <div>---</div>
+
+                    <div style="margin-bottom: 40px;">
+                        {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
+                    </div>
+
+                    <div style="font-size: 16px; color: #242424;">
+                        {{ __('shop::app.mail.order.payment') }}
+                    </div>
+
+                    <div style="font-weight: bold; font-size: 16px; color: #242424; margin-bottom: 20px;">
+                        {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                    </div>
+
+                    @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp
+
+                    @if (! empty($additionalDetails))
+                        <div style="font-size: 16px; color: #242424;">
+                            <div>{{ $additionalDetails['title'] }}</div>
+                            <div>{{ $additionalDetails['value'] }}</div>
+                        </div>
+                    @endif
+                </div>
+            @endif
         </div>
 
         <div class="section-content">
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-refund.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-refund.blade.php
index cc71d2b6c..873d12bfa 100644
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-refund.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-refund.blade.php
@@ -77,49 +77,51 @@
                 </div>
             @endif
 
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.billing-address') }}
-                </div>
+            @if ($order->billing_address)
+                <div style="line-height: 25px;">
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.billing-address') }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->company_name ?? '' }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->company_name ?? '' }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->name }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->name }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->address1 }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->address1 }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->postcode . " " . $order->billing_address->city }}
-                </div>
-                
-                <div>
-                    {{ $order->billing_address->state }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->postcode . " " . $order->billing_address->city }}
+                    </div>
 
-                <div>
-                    {{ core()->country_name($order->billing_address->country) }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->state }}
+                    </div>
 
-                <div>---</div>
+                    <div>
+                        {{ core()->country_name($order->billing_address->country) }}
+                    </div>
 
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
-                </div>
+                    <div>---</div>
 
-                <div style="font-size: 16px; color: #242424;">
-                    {{ __('shop::app.mail.order.payment') }}
-                </div>
+                    <div style="margin-bottom: 40px;">
+                        {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
+                    </div>
 
-                <div style="font-weight: bold;font-size: 16px; color: #242424;">
-                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                    <div style="font-size: 16px; color: #242424;">
+                        {{ __('shop::app.mail.order.payment') }}
+                    </div>
+
+                    <div style="font-weight: bold;font-size: 16px; color: #242424;">
+                        {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                    </div>
                 </div>
-            </div>
+            @endif
         </div>
 
         <div class="section-content">
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
index 7acab7816..d9c535a95 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
@@ -31,103 +31,107 @@
         </div>
 
         <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.shipping-address') }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->address1 }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->shipping_address->country) }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
-                </div>
-
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.shipping') }}
-                </div>
-
-                <div style="font-size: 16px;color: #242424;">
-                    <div style="font-weight: bold;">
-                        {{ $order->shipping_title }}
+            @if ($order->shipping_address)
+                <div style="line-height: 25px;">
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.shipping-address') }}
                     </div>
 
-                    <div style="margin-top: 5px;">
-                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.carrier') }} : </span>{{ $shipment->carrier_title }}
+                    <div>
+                        {{ $order->shipping_address->company_name ?? '' }}
                     </div>
 
-                    <div style="margin-top: 5px;">
-                        <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.tracking-number') }} : </span>{{ $shipment->track_number }}
+                    <div>
+                        {{ $order->shipping_address->name }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->address1 }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->state }}
+                    </div>
+
+                    <div>
+                        {{ core()->country_name($order->shipping_address->country) }}
+                    </div>
+
+                    <div>---</div>
+
+                    <div style="margin-bottom: 40px;">
+                        {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }}
+                    </div>
+
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.shipping') }}
+                    </div>
+
+                    <div style="font-size: 16px;color: #242424;">
+                        <div style="font-weight: bold;">
+                            {{ $order->shipping_title }}
+                        </div>
+
+                        <div style="margin-top: 5px;">
+                            <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.carrier') }} : </span>{{ $shipment->carrier_title }}
+                        </div>
+
+                        <div style="margin-top: 5px;">
+                            <span style="font-weight: bold;">{{ __('shop::app.mail.shipment.tracking-number') }} : </span>{{ $shipment->track_number }}
+                        </div>
                     </div>
                 </div>
-            </div>
+            @endif
 
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.billing-address') }}
-                </div>
+            @if ($order->billing_address)
+                <div style="line-height: 25px;">
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.billing-address') }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->company_name ?? '' }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->company_name ?? '' }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->name }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->name }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->address1 }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->address1 }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->postcode . " " . $order->billing_address->city }}
-                </div>
-                
-                <div>
-                    {{ $order->billing_address->state }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->postcode . " " . $order->billing_address->city }}
+                    </div>
 
-                <div>
-                    {{ core()->country_name($order->billing_address->country) }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->state }}
+                    </div>
 
-                <div>---</div>
+                    <div>
+                        {{ core()->country_name($order->billing_address->country) }}
+                    </div>
 
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
-                </div>
+                    <div>---</div>
 
-                <div style="font-weight: bold; font-size: 16px; color: #242424;">
-                    {{ __('shop::app.mail.order.payment') }}
-                </div>
+                    <div style="margin-bottom: 40px;">
+                        {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
+                    </div>
 
-                <div style="font-weight: bold; font-size: 16px; color: #242424;">
-                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                    <div style="font-weight: bold; font-size: 16px; color: #242424;">
+                        {{ __('shop::app.mail.order.payment') }}
+                    </div>
+
+                    <div style="font-weight: bold; font-size: 16px; color: #242424;">
+                        {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                    </div>
                 </div>
-            </div>
+            @endif
         </div>
 
         <div class="section-content">
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel-admin.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel-admin.blade.php
index 5c08eca68..91d54e6bb 100644
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel-admin.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel-admin.blade.php
@@ -33,93 +33,97 @@
         </div>
 
         <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.cancel.shipping-address') }}
+            @if ($order->shipping_address)
+                <div style="line-height: 25px;">
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.cancel.shipping-address') }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->company_name ?? '' }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->name }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->address1 }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
+                    </div>
+
+                    <div>
+                        {{ $order->shipping_address->state }}
+                    </div>
+
+                    <div>
+                        {{ core()->country_name($order->shipping_address->country) }}
+                    </div>
+
+                    <div>---</div>
+
+                    <div style="margin-bottom: 40px;">
+                        {{ __('shop::app.mail.order.cancel.contact') }} : {{ $order->shipping_address->phone }}
+                    </div>
+
+                    <div style="font-size: 16px;color: #242424; font-weight: bold">
+                        {{ __('shop::app.mail.order.cancel.shipping') }}
+                    </div>
+
+                    <div style="font-size: 16px;color: #242424;">
+                        {{ $order->shipping_title }}
+                    </div>
                 </div>
+            @endif
 
-                <div>
-                    {{ $order->shipping_address->company_name ?? '' }}
+            @if ($order->billing_address)
+                <div style="line-height: 25px;">
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.cancel.billing-address') }}
+                    </div>
+
+                    <div>
+                        {{ $order->billing_address->company_name ?? '' }}
+                    </div>
+
+                    <div>
+                        {{ $order->billing_address->name }}
+                    </div>
+
+                    <div>
+                        {{ $order->billing_address->address1 }}
+                    </div>
+
+                    <div>
+                        {{ $order->billing_address->postcode . " " .  $order->billing_address->city }}
+                    </div>
+
+                    <div>
+                        {{ $order->billing_address->state }}
+                    </div>
+
+                    <div>
+                        {{ core()->country_name($order->billing_address->country) }}
+                    </div>
+
+                    <div>---</div>
+
+                    <div style="margin-bottom: 40px;">
+                        {{ __('shop::app.mail.order.cancel.contact') }} : {{ $order->billing_address->phone }}
+                    </div>
+
+                    <div style="font-size: 16px; color: #242424; font-weight: bold">
+                        {{ __('shop::app.mail.order.cancel.payment') }}
+                    </div>
+
+                    <div style="font-size: 16px; color: #242424;">
+                        {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                    </div>
                 </div>
-
-                <div>
-                    {{ $order->shipping_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->address1 }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
-                </div>
-
-                <div>
-                    {{ $order->shipping_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->shipping_address->country) }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.cancel.contact') }} : {{ $order->shipping_address->phone }}
-                </div>
-
-                <div style="font-size: 16px;color: #242424; font-weight: bold">
-                    {{ __('shop::app.mail.order.cancel.shipping') }}
-                </div>
-
-                <div style="font-size: 16px;color: #242424;">
-                    {{ $order->shipping_title }}
-                </div>
-            </div>
-
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.cancel.billing-address') }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->company_name ?? '' }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->name }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->address1 }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->postcode . " " .  $order->billing_address->city }}
-                </div>
-
-                <div>
-                    {{ $order->billing_address->state }}
-                </div>
-
-                <div>
-                    {{ core()->country_name($order->billing_address->country) }}
-                </div>
-
-                <div>---</div>
-
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.cancel.contact') }} : {{ $order->billing_address->phone }}
-                </div>
-
-                <div style="font-size: 16px; color: #242424; font-weight: bold">
-                    {{ __('shop::app.mail.order.cancel.payment') }}
-                </div>
-
-                <div style="font-size: 16px; color: #242424;">
-                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
-                </div>
-            </div>
+            @endif
         </div>
 
         <div class="section-content">
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php
index b7a5b6bbf..c469a90c3 100644
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php
@@ -29,89 +29,93 @@
         </div>
 
         <div style="display: flex;flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 40px;">
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.cancel.shipping-address') }}
-                </div>
+            @if ($order->shipping_address)
+                <div style="line-height: 25px;">
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.cancel.shipping-address') }}
+                    </div>
 
-                <div>
-                    {{ $order->shipping_address->company_name ?? '' }}
-                </div>
+                    <div>
+                        {{ $order->shipping_address->company_name ?? '' }}
+                    </div>
 
-                <div>
-                    {{ $order->shipping_address->name }}
-                </div>
+                    <div>
+                        {{ $order->shipping_address->name }}
+                    </div>
 
-                <div>
-                    {{ $order->shipping_address->address1 }}
-                </div>
+                    <div>
+                        {{ $order->shipping_address->address1 }}
+                    </div>
 
-                <div>
-                    {{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
-                </div>
+                    <div>
+                        {{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
+                    </div>
 
-                <div>
-                    {{ $order->shipping_address->state }}
-                </div>
+                    <div>
+                        {{ $order->shipping_address->state }}
+                    </div>
 
-                <div>
-                    {{ core()->country_name($order->shipping_address->country) }}
-                </div>
+                    <div>
+                        {{ core()->country_name($order->shipping_address->country) }}
+                    </div>
 
-                <div>---</div>
+                    <div>---</div>
 
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.cancel.contact') }} : {{ $order->shipping_address->phone }}
-                </div>
+                    <div style="margin-bottom: 40px;">
+                        {{ __('shop::app.mail.order.cancel.contact') }} : {{ $order->shipping_address->phone }}
+                    </div>
 
-                <div style="font-size: 16px;color: #242424; font-weight: bold">
-                    {{ __('shop::app.mail.order.cancel.shipping') }}
-                </div>
+                    <div style="font-size: 16px;color: #242424; font-weight: bold">
+                        {{ __('shop::app.mail.order.cancel.shipping') }}
+                    </div>
 
-                <div style="font-size: 16px;color: #242424;">
-                    {{ $order->shipping_title }}
+                    <div style="font-size: 16px;color: #242424;">
+                        {{ $order->shipping_title }}
+                    </div>
                 </div>
-            </div>
+            @endif
 
-            <div style="line-height: 25px;">
-                <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                    {{ __('shop::app.mail.order.cancel.billing-address') }}
-                </div>
+            @if ($order->billing_address)
+                <div style="line-height: 25px;">
+                    <div style="font-weight: bold;font-size: 16px;color: #242424;">
+                        {{ __('shop::app.mail.order.cancel.billing-address') }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->company_name ?? '' }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->company_name ?? '' }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->address1 }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->address1 }}
+                    </div>
 
-                <div>
-                    {{ $order->billing_address->postcode . " " . $order->billing_address->city }}
-                </div>
-                
-                <div>
-                    {{ $order->billing_address->state }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->postcode . " " . $order->billing_address->city }}
+                    </div>
 
-                <div>
-                    {{ core()->country_name($order->billing_address->country) }}
-                </div>
+                    <div>
+                        {{ $order->billing_address->state }}
+                    </div>
 
-                <div>---</div>
+                    <div>
+                        {{ core()->country_name($order->billing_address->country) }}
+                    </div>
 
-                <div style="margin-bottom: 40px;">
-                    {{ __('shop::app.mail.order.cancel.contact') }} : {{ $order->billing_address->phone }}
-                </div>
+                    <div>---</div>
 
-                <div style="font-size: 16px; color: #242424; font-weight: bold">
-                    {{ __('shop::app.mail.order.cancel.payment') }}
-                </div>
+                    <div style="margin-bottom: 40px;">
+                        {{ __('shop::app.mail.order.cancel.contact') }} : {{ $order->billing_address->phone }}
+                    </div>
 
-                <div style="font-size: 16px; color: #242424;">
-                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                    <div style="font-size: 16px; color: #242424; font-weight: bold">
+                        {{ __('shop::app.mail.order.cancel.payment') }}
+                    </div>
+
+                    <div style="font-size: 16px; color: #242424;">
+                        {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                    </div>
                 </div>
-            </div>
+            @endif
         </div>
 
         <div class="section-content">
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
index 106688978..5dce34e92 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
@@ -513,17 +513,19 @@
         <div class="sale-section">
             <div class="section-content" style="border-bottom: 0">
                 <div class="order-box-container">
-                    <div class="box">
-                        <div class="box-title">
-                            {{ __('shop::app.customer.account.order.view.billing-address') }}
-                        </div>
+                    @if ($order->billing_address)
+                        <div class="box">
+                            <div class="box-title">
+                                {{ __('shop::app.customer.account.order.view.billing-address') }}
+                            </div>
 
-                        <div class="box-content">
-                            @include ('admin::sales.address', ['address' => $order->billing_address])
+                            <div class="box-content">
+                                @include ('admin::sales.address', ['address' => $order->billing_address])
 
-                            {!! view_render_event('bagisto.shop.customers.account.orders.view.billing-address.after', ['order' => $order]) !!}
+                                {!! view_render_event('bagisto.shop.customers.account.orders.view.billing-address.after', ['order' => $order]) !!}
+                            </div>
                         </div>
-                    </div>
+                    @endif
 
                     @if ($order->shipping_address)
                         <div class="box">