diff --git a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
index 54d88555..b1a28972 100644
--- a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
+++ b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
@@ -131,7 +131,7 @@
                 </div>
                 <div class="row m-b-15">
                     <div class="col">
-                        <div class="form-group no-margin form-group-default p-b-5">
+                        <validation-wrapper-component :validator="$v.parameters.atLeastOneSelected">
                             <label>Available to receive goods on: </label> 
                             <div class="row">
                                 <div class="col-12 col-md pb-3 pb-md-0">
@@ -159,7 +159,10 @@
                                     </div>
                                 </div>
                             </div>
-                        </div>
+                            <span v-if="$v.parameters.atLeastOneSelected.$error" class="text-danger fs-10">
+                                You must choose at least one option.
+                            </span>
+                        </validation-wrapper-component>
                     </div>
                 </div>
                 <div class="row m-b-15">
diff --git a/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue b/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue
index 31316368..b9d41532 100644
--- a/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue
@@ -25,7 +25,7 @@
                                         </div>
                                         <div class="col-auto semi-bold">New Address</div>
                                     </div>
-                                    <div class="row" v-show="!parameters.address_id">
+                                    <div class="row" v-show="!parameters.address_id && !this.expanded_address_id">
                                         <div class="col">
                                             <address-form-component :id="data.company_module.id" section="addressList" @input="parameters.address_id = $event"></address-form-component>
                                         </div>
diff --git a/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js b/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js
index c2778a26..c114248c 100644
--- a/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js
+++ b/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js
@@ -22,6 +22,18 @@ export default {
             person_in_charge: { required },
             property_type: { required },
             additional_request: {  },
+            receive_goods_working_hours: {},
+            receive_goods_after_hours: {},
+            receive_goods_on_saturday: {},
+            atLeastOneSelected: {
+                required: function () {
+                    return (
+                        this.parameters.receive_goods_working_hours ||
+                        this.parameters.receive_goods_after_hours ||
+                        this.parameters.receive_goods_on_saturday
+                    );
+                }
+            }
         }
     },
     mixins: [addressFormHandler]