diff --git a/resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue b/resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue
index a52ebbb3..15fc37af 100644
--- a/resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue
+++ b/resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue
@@ -101,16 +101,32 @@
                                 </div>
                             </div>
                             <div class="row text-center parentContainer m-t-10" v-if="$store.getters.isSuperAdmin &&  ['Pending Invoice', 'Pending Approval'].includes(invoice_status)" >
-                                <div class="col-auto requestModal pointer" data-type="editBillingAddress">
-                                    <i class="fa fa-edit pointer fa-fw m-l-5"></i> Edit billing Address
-                                </div>
-                                <modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="editBillingAddress">
-                                    <div class="row">
-                                        <div class="col bg-white">
-                                            <address-form-component :data="item.order.address" section="editBillingAddress"></address-form-component>
+                                <div class="col">
+                                    <div class="row" v-if="!item.order.company_module.billingAddress">
+                                        <div class="col">
+                                            <div>
+                                                <div class="btn btn-primary btn-xs pointer requestModal btn-block" data-type="billingAddressComponent">Add Billing Address</div>
+                                                <modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="billingAddressComponent">
+                                                    <address-form-component :id="item.order.company_module.id" :section="section" :type=1></address-form-component>
+                                                </modal-component>
+                                            </div>
                                         </div>
                                     </div>
-                                </modal-component>
+                                    <div class="row" v-if="item.order.company_module.billingAddress">
+                                        <div class="col">
+                                            <div class="col-auto requestModal pointer" data-type="editBillingAddress">
+                                                <i class="fa fa-edit pointer fa-fw m-l-5"></i> Edit billing Address
+                                            </div>
+                                            <modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="editBillingAddress">
+                                                <div class="row">
+                                                    <div class="col bg-white">
+                                                        <address-form-component :data="item.order.company_module.billingAddress" section="editBillingAddress"></address-form-component>
+                                                    </div>
+                                                </div>
+                                            </modal-component>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>