diff --git a/src/store/modules/Control/ServerLedStore.js b/src/store/modules/Control/ServerLedStore.js
index d7c1234..a8903e2 100644
--- a/src/store/modules/Control/ServerLedStore.js
+++ b/src/store/modules/Control/ServerLedStore.js
@@ -27,12 +27,12 @@
         .catch((error) => console.log(error));
     },
     async saveIndicatorLedActiveState({ commit }, payload) {
+      commit('setIndicatorLedActiveState', payload);
       return await api
         .patch('/redfish/v1/Systems/system', {
           LocationIndicatorActive: payload,
         })
         .then(() => {
-          commit('setIndicatorLedActiveState', payload);
           if (payload) {
             return i18n.t('pageServerLed.toast.successServerLedOn');
           } else {
@@ -41,6 +41,7 @@
         })
         .catch((error) => {
           console.log(error);
+          commit('setIndicatorLedActiveState', !payload);
           if (payload) {
             throw new Error(i18n.t('pageServerLed.toast.errorServerLedOn'));
           } else {
diff --git a/src/views/Control/ServerLed/ServerLed.vue b/src/views/Control/ServerLed/ServerLed.vue
index e5c6dac..72726ba 100644
--- a/src/views/Control/ServerLed/ServerLed.vue
+++ b/src/views/Control/ServerLed/ServerLed.vue
@@ -64,9 +64,7 @@
           indicatorLedActiveState
         )
         .then((message) => this.successToast(message))
-        .catch(({ message }) => {
-          this.errorToast(message);
-        });
+        .catch(({ message }) => this.errorToast(message));
     },
   },
 };
diff --git a/src/views/Overview/OverviewQuickLinks.vue b/src/views/Overview/OverviewQuickLinks.vue
index 82975f5..1b84ce7 100644
--- a/src/views/Overview/OverviewQuickLinks.vue
+++ b/src/views/Overview/OverviewQuickLinks.vue
@@ -92,9 +92,7 @@
           indicatorLedActiveState
         )
         .then((message) => this.successToast(message))
-        .catch(({ message }) => {
-          this.errorToast(message);
-        });
+        .catch(({ message }) => this.errorToast(message));
     },
   },
 };
