diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py
index f408734df40c1bc5c16b7e108e3ce5a211165f71..e5fc4c81f076de015a9ff7b6e453b03849ed72c0 100644
--- a/src/monitoring/service/MonitoringServiceServicerImpl.py
+++ b/src/monitoring/service/MonitoringServiceServicerImpl.py
@@ -531,7 +531,9 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer):
                             kpi.kpi_id.kpi_id.uuid = str(item[0])
                             kpi.timestamp.timestamp = timestamp_string_to_float(item[1])
                             kpi.kpi_value.floatVal = item[2]  # This must be improved
-                            alarm_response.kpi_list.kpi.append(kpi)
+                            # The following condition needs to be improved to take into account all cases
+                            if (kpi.kpi_value.floatVal > kpiMinValue) or (kpi.kpi_value.floatVal < kpiMaxValue): 
+                                alarm_response.kpi_list.kpi.append(kpi)
                         alarm_response.alarm_id.alarm_id.uuid = alarm_id
                         yield alarm_response
                     if timestamp_utcnow_to_float() > end_timestamp: