diff --git a/src/store/modules/Control/ServerLedStore.js b/src/store/modules/Control/ServerLedStore.js
index 51e0920..26a32cc 100644
--- a/src/store/modules/Control/ServerLedStore.js
+++ b/src/store/modules/Control/ServerLedStore.js
@@ -4,7 +4,7 @@
 const ServerLedStore = {
   namespaced: true,
   state: {
-    indicatorValue: 'Off',
+    indicatorValue: false,
   },
   getters: {
     getIndicatorValue: (state) => state.indicatorValue,
@@ -19,16 +19,18 @@
       return await api
         .get('/redfish/v1/Systems/system')
         .then((response) => {
-          commit('setIndicatorValue', response.data.IndicatorLED);
+          commit('setIndicatorValue', response.data.LocationIndicatorActive);
         })
         .catch((error) => console.log(error));
     },
     async saveIndicatorLedValue({ commit }, payload) {
       return await api
-        .patch('/redfish/v1/Systems/system', { IndicatorLED: payload })
+        .patch('/redfish/v1/Systems/system', {
+          LocationIndicatorActive: payload,
+        })
         .then(() => {
           commit('setIndicatorValue', payload);
-          if (payload === 'Lit') {
+          if (payload) {
             return i18n.t('pageServerLed.toast.successServerLedOn');
           } else {
             return i18n.t('pageServerLed.toast.successServerLedOff');
@@ -36,7 +38,7 @@
         })
         .catch((error) => {
           console.log(error);
-          if (payload === 'Lit') {
+          if (payload) {
             throw new Error(i18n.t('pageServerLed.toast.errorServerLedOn'));
           } else {
             throw new Error(i18n.t('pageServerLed.toast.errorServerLedOff'));
diff --git a/src/views/Control/ServerLed/ServerLed.vue b/src/views/Control/ServerLed/ServerLed.vue
index 73ec704..6ec6230 100644
--- a/src/views/Control/ServerLed/ServerLed.vue
+++ b/src/views/Control/ServerLed/ServerLed.vue
@@ -9,12 +9,10 @@
               v-model="indicatorLed"
               data-test-id="serverLed-checkbox-switchIndicatorLed"
               name="check-button"
-              value="Lit"
-              unchecked-value="Off"
               switch
               @change="changeLedValue"
             >
-              <span v-if="indicatorLed && indicatorLed !== 'Off'">
+              <span v-if="indicatorLed">
                 {{ $t('global.status.on') }}
               </span>
               <span v-else>
@@ -65,10 +63,10 @@
         .then((message) => this.successToast(message))
         .catch(({ message }) => {
           this.errorToast(message);
-          if (indicatorLed === 'Off') {
-            this.indicatorLed === 'Lit';
+          if (!indicatorLed) {
+            this.indicatorLed === true;
           } else {
-            this.indicatorLed === 'Off';
+            this.indicatorLed === false;
           }
         });
     },
diff --git a/src/views/Overview/OverviewQuickLinks.vue b/src/views/Overview/OverviewQuickLinks.vue
index 1330ca5..207478a 100644
--- a/src/views/Overview/OverviewQuickLinks.vue
+++ b/src/views/Overview/OverviewQuickLinks.vue
@@ -18,11 +18,9 @@
             data-test-id="overviewQuickLinks-checkbox-serverLed"
             name="check-button"
             switch
-            value="Lit"
-            unchecked-value="Off"
             @change="onChangeServerLed"
           >
-            <span v-if="serverLedChecked !== 'Off'">
+            <span v-if="serverLedChecked">
               {{ $t('global.status.on') }}
             </span>
             <span v-else>{{ $t('global.status.off') }}</span>
