diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js
index 414f58fe..3f836a15 100644
--- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js
+++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js
@@ -374,20 +374,22 @@ const CombinedEquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
         setParameterLineChartOptions(names);
       
         let detailed_value_list = [];
-        json['reporting_period_efficiency']['timestamps'][0].forEach((currentTimestamp, timestampIndex) => {
-          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);
-            } else {
-              detailed_value['a' + 2 * energyCategoryIndex] = '';
-            };
+        if (json['reporting_period_efficiency']['timestamps'].length > 0) {
+          json['reporting_period_efficiency']['timestamps'][0].forEach((currentTimestamp, timestampIndex) => {
+            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);
+              } else {
+                detailed_value['a' + 2 * energyCategoryIndex] = '';
+              };
+            });
+            
+            detailed_value_list.push(detailed_value);
           });
-           
-          detailed_value_list.push(detailed_value);
-        });
+        };
 
         let detailed_value = {};
         detailed_value['id'] = detailed_value_list.length;
diff --git a/web/src/components/MyEMS/Equipment/EquipmentEfficiency.js b/web/src/components/MyEMS/Equipment/EquipmentEfficiency.js
index e112a29e..e457a80a 100644
--- a/web/src/components/MyEMS/Equipment/EquipmentEfficiency.js
+++ b/web/src/components/MyEMS/Equipment/EquipmentEfficiency.js
@@ -374,20 +374,22 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
         setParameterLineChartOptions(names);
       
         let detailed_value_list = [];
-        json['reporting_period_efficiency']['timestamps'][0].forEach((currentTimestamp, timestampIndex) => {
-          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);
-            } else {
-              detailed_value['a' + 2 * energyCategoryIndex] = '';
-            };
+        if (json['reporting_period_efficiency']['timestamps'].length > 0) {
+          json['reporting_period_efficiency']['timestamps'][0].forEach((currentTimestamp, timestampIndex) => {
+            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);
+              } else {
+                detailed_value['a' + 2 * energyCategoryIndex] = '';
+              };
+            });
+            
+            detailed_value_list.push(detailed_value);
           });
-           
-          detailed_value_list.push(detailed_value);
-        });
+        };
 
         let detailed_value = {};
         detailed_value['id'] = detailed_value_list.length;