diff --git a/ui/src/components/CheckBoxSelectPair.vue b/ui/src/components/CheckBoxSelectPair.vue
index 5c95252d83b..ec6c6fa16c8 100644
--- a/ui/src/components/CheckBoxSelectPair.vue
+++ b/ui/src/components/CheckBoxSelectPair.vue
@@ -23,7 +23,7 @@
     <a-form-item class="pair-select-container" :label="selectLabel" v-if="this.checked">
       <a-select
         v-decorator="[selectDecorator, {
-          initialValue: this.getSelectInitialValue()
+          initialValue: selectedOption ? selectedOption : this.getSelectInitialValue()
         }]"
         showSearch
         optionFilterProp="children"
@@ -80,23 +80,16 @@ export default {
       return array !== null && array !== undefined && Array.isArray(array) && array.length > 0
     },
     getSelectInitialValue () {
-      if (this.arrayHasItems(this.selectOptions)) {
-        for (var i = 0; i < this.selectOptions.length; i++) {
-          if (this.selectOptions[i].enabled !== false) {
-            return this.selectOptions[i].name
-          }
-        }
-      }
-      return ''
+      const provider = this.selectOptions?.filter(x => x.enabled)?.[0]?.name || ''
+      this.handleSelectChange(provider)
+      return provider
     },
     handleCheckChange (e) {
       this.checked = e.target.checked
-      if (this.checked && this.arrayHasItems(this.selectOptions)) {
-        this.selectedOption = this.selectOptions[0].name
-      }
       this.$emit('handle-checkpair-change', this.resourceKey, this.checked, '')
     },
     handleSelectChange (val) {
+      this.selectedOption = val
       this.$emit('handle-checkpair-change', this.resourceKey, this.checked, val)
     }
   }
diff --git a/ui/src/views/offering/AddNetworkOffering.vue b/ui/src/views/offering/AddNetworkOffering.vue
index 48b39a3feca..910bc2bb8ab 100644
--- a/ui/src/views/offering/AddNetworkOffering.vue
+++ b/ui/src/views/offering/AddNetworkOffering.vue
@@ -228,7 +228,7 @@
                   message: `${this.$t('message.error.select')}`
                 }
               ],
-              initialValue: 0
+              initialValue: this.serviceOfferings.length > 0 ? this.serviceOfferings[0].id : ''
             }]"
             showSearch
             optionFilterProp="children"
@@ -237,7 +237,7 @@
             }"
             :loading="serviceOfferingLoading"
             :placeholder="this.$t('label.serviceofferingid')">
-            <a-select-option v-for="(opt, optIndex) in this.serviceOfferings" :key="optIndex">
+            <a-select-option v-for="(opt) in this.serviceOfferings" :key="opt.id">
               {{ opt.name || opt.description }}
             </a-select-option>
           </a-select>