diff --git a/src/store/modules/Control/PowerCapStore.js b/src/store/modules/Control/PowerCapStore.js
index bef9f47..45a06ad 100644
--- a/src/store/modules/Control/PowerCapStore.js
+++ b/src/store/modules/Control/PowerCapStore.js
@@ -3,18 +3,14 @@
 const PowerCapStore = {
   namespaced: true,
   state: {
-    powerCapData: null,
-    powerCapValue: 'Not enabled'
+    powerCapData: false
   },
   getters: {
-    powerCapData: state => state.powerCapData,
-    powerCapValue: state => state.powerCapValue
+    powerCapData: state => state.powerCapData
   },
   mutations: {
     setPowerCapData: (state, powerCapData) =>
-      (state.powerCapData = powerCapData),
-    setPowerCapValue: (state, powerCapValue) =>
-      (state.powerCapValue = powerCapValue)
+      (state.powerCapData = powerCapData)
   },
   actions: {
     getPowerCapData({ commit }) {
@@ -23,7 +19,7 @@
         .then(response => {
           const powerCapData = response.data.data;
           if (powerCapData.PowerCapEnable) {
-            commit('setPowerCapValue', powerCapData.PowerCap + ' W');
+            commit('setPowerCapData', powerCapData.PowerCap);
           }
         })
         .catch(error => {
diff --git a/src/store/modules/Control/PowerConsumptionStore.js b/src/store/modules/Control/PowerConsumptionStore.js
index 03ccffc..bdc9751 100644
--- a/src/store/modules/Control/PowerConsumptionStore.js
+++ b/src/store/modules/Control/PowerConsumptionStore.js
@@ -3,15 +3,12 @@
 const PowerConsumptionStore = {
   namespaced: true,
   state: {
-    powerData: null,
-    powerConsumption: 'Not available'
+    powerConsumption: false
   },
   getters: {
-    powerData: state => state.powerData,
     powerConsumption: state => state.powerConsumption
   },
   mutations: {
-    setPowerData: (state, powerData) => (state.powerData = powerData),
     setPowerConsumption: (state, powerConsumption) =>
       (state.powerConsumption = powerConsumption)
   },
@@ -22,7 +19,7 @@
         .then(response => {
           const powerData = response.data.data;
           let powerConsumption =
-            powerData.Value * Math.pow(10, powerData.Scale) + ' W';
+            powerData.Value * Math.pow(10, powerData.Scale);
           commit('setPowerConsumption', powerConsumption);
         })
         .catch(error => {