diff --git a/src/components/SystemSettingDialog.vue b/src/components/SystemSettingDialog.vue
index 33d911b..2a3b4cd 100644
--- a/src/components/SystemSettingDialog.vue
+++ b/src/components/SystemSettingDialog.vue
@@ -40,13 +40,20 @@
             name="network"
             icon="language"
             :label="$t('network setting')"
+            :disable="loading"
           />
           <q-tab
             name="graphics"
             icon="picture_in_picture_alt"
             :label="$t('graphics setting')"
+            :disable="loading"
+          />
+          <q-tab
+            name="other"
+            icon="build"
+            :label="$t('other setting')"
+            :disable="loading"
           />
-          <q-tab name="other" icon="build" :label="$t('other setting')" />
         </q-tabs>
         <q-separator />
         <q-tab-panels v-model="tab" animated>
@@ -64,6 +71,7 @@
                           v-model="auto_ip"
                           :options="[$t('enable'), $t('disable')]"
                           :loading="loading"
+                          :disable="loading"
                         />
                       </q-item-section>
                     </q-item>
@@ -75,6 +83,7 @@
                         <q-input
                           v-model="ip_address"
                           :loading="loading"
+                          :disable="loading"
                           maxlength="15"
                           :rules="[
                             (val) =>
@@ -95,6 +104,7 @@
                       <q-item-section>
                         <q-input
                           :loading="loading"
+                          :disable="loading"
                           v-model="gateway"
                           maxlength="15"
                           :rules="[
@@ -116,6 +126,7 @@
                       <q-item-section>
                         <q-input
                           :loading="loading"
+                          :disable="loading"
                           v-model="netmask"
                           maxlength="15"
                           :rules="[
@@ -138,6 +149,7 @@
                         <q-input
                           v-model="mac_address"
                           :loading="loading"
+                          :disable="loading"
                           maxlength="17"
                           :rules="[
                             (val) =>
@@ -171,6 +183,7 @@
                         <q-input
                           v-model="brightness"
                           :loading="loading"
+                          :disable="loading"
                           type="number"
                         />
                       </q-item-section>
@@ -183,6 +196,7 @@
                         <q-input
                           v-model="contrast"
                           :loading="loading"
+                          :disable="loading"
                           type="number"
                         />
                       </q-item-section>
@@ -195,6 +209,7 @@
                         <q-input
                           v-model="hue"
                           :loading="loading"
+                          :disable="loading"
                           type="number"
                         />
                       </q-item-section>
@@ -207,6 +222,7 @@
                         <q-select
                           v-model="device_resolution"
                           :loading="loading"
+                          :disable="loading"
                           :options="device_resolution_options"
                         />
                       </q-item-section>
@@ -219,6 +235,7 @@
                         <q-select
                           v-model="output_board_resolution"
                           :loading="loading"
+                          :disable="loading"
                           :options="output_board_resolution_options"
                         />
                       </q-item-section>
@@ -242,6 +259,7 @@
                         <q-select
                           v-model="use_ntp"
                           :loading="loading"
+                          :disable="loading"
                           :options="[$t('enable'), $t('disable')]"
                         />
                       </q-item-section>
@@ -251,7 +269,11 @@
                         $t("ntp server") + ":"
                       }}</q-item-section>
                       <q-item-section>
-                        <q-input v-model="ntp_server" :loading="loading" />
+                        <q-input
+                          v-model="ntp_server"
+                          :loading="loading"
+                          :disable="loading"
+                        />
                       </q-item-section>
                     </q-item>
                     <q-item v-if="use_ntp == $t('enable')">
@@ -262,6 +284,7 @@
                         <q-input
                           v-model="ntp_sync_delay"
                           :loading="loading"
+                          :disable="loading"
                           type="number"
                         />
                       </q-item-section>
@@ -274,6 +297,7 @@
                         <q-input
                           v-model="current_date"
                           :loading="loading"
+                          :disable="loading"
                           type="date"
                         />
                       </q-item-section>
@@ -281,6 +305,7 @@
                         <q-input
                           v-model="current_time"
                           :loading="loading"
+                          :disable="loading"
                           type="time"
                         />
                       </q-item-section>
@@ -293,6 +318,7 @@
                         <q-select
                           v-model="time_zone"
                           :loading="loading"
+                          :disable="loading"
                           :options="time_zone_options"
                         />
                       </q-item-section>
@@ -531,10 +557,6 @@ export default defineComponent({
 
         let success = false;
         try {
-          GlobalData.getInstance()
-            .getCurrentClient()
-            ?.setSystemNetwork(request);
-          success = true;
           setTimeout(() => {
             if (request.ip_address != $store.state.device_ip_address) {
               setTimeout(() => {
@@ -550,6 +572,10 @@ export default defineComponent({
               }, 1500);
             }
           }, 1000 * 10);
+          /*await*/ GlobalData.getInstance()
+            .getCurrentClient()
+            ?.setSystemNetwork(request);
+          success = true;
         } catch {}
         $q.notify({
           color: success ? "positive" : "negative",