diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js
index 3f836a15..c37a3fb4 100644
--- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js
+++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js
@@ -379,11 +379,11 @@ const CombinedEquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
             let detailed_value = {};
             detailed_value['id'] = timestampIndex;
             detailed_value['startdatetime'] = currentTimestamp;
-            json['reporting_period_efficiency']['values'].forEach((currentValue, energyCategoryIndex) => {
-              if (json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex] != null) {
-                detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex].toFixed(2);
+            json['reporting_period_efficiency']['values'].forEach((currentValue, parameterIndex) => {
+              if (json['reporting_period_efficiency']['values'][parameterIndex][timestampIndex] != null) {
+                detailed_value['a' + parameterIndex] = json['reporting_period_efficiency']['values'][parameterIndex][timestampIndex].toFixed(2);
               } else {
-                detailed_value['a' + 2 * energyCategoryIndex] = '';
+                detailed_value['a' + parameterIndex] = '';
               };
             });
             
diff --git a/web/src/components/MyEMS/Equipment/EquipmentEfficiency.js b/web/src/components/MyEMS/Equipment/EquipmentEfficiency.js
index e457a80a..7046a735 100644
--- a/web/src/components/MyEMS/Equipment/EquipmentEfficiency.js
+++ b/web/src/components/MyEMS/Equipment/EquipmentEfficiency.js
@@ -379,11 +379,11 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
             let detailed_value = {};
             detailed_value['id'] = timestampIndex;
             detailed_value['startdatetime'] = currentTimestamp;
-            json['reporting_period_efficiency']['values'].forEach((currentValue, energyCategoryIndex) => {
-              if (json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex] != null) {
-                detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex].toFixed(2);
+            json['reporting_period_efficiency']['values'].forEach((currentValue, parameterIndex) => {
+              if (json['reporting_period_efficiency']['values'][parameterIndex][timestampIndex] != null) {
+                detailed_value['a' + arameterIndex] = json['reporting_period_efficiency']['values'][parameterIndex][timestampIndex].toFixed(2);
               } else {
-                detailed_value['a' + 2 * energyCategoryIndex] = '';
+                detailed_value['a' + parameterIndex] = '';
               };
             });