diff --git a/src/kpi_value_api/service/KpiValueApiServiceServicerImpl.py b/src/kpi_value_api/service/KpiValueApiServiceServicerImpl.py
index 0f57f88219a74108a555cf87e9bdb98999fd5da2..0e2d49300ccf1cffed7f09435136055b8c70615e 100644
--- a/src/kpi_value_api/service/KpiValueApiServiceServicerImpl.py
+++ b/src/kpi_value_api/service/KpiValueApiServiceServicerImpl.py
@@ -157,7 +157,7 @@ class KpiValueApiServiceServicerImpl(KpiValueAPIServiceServicer):
                 value["window"]["end"], "%Y-%m-%dT%H:%M:%S.%fZ").timestamp()
             response.kpi_id.kpi_id.uuid  = value['kpi_id']
             for key, threshold in value.items():
-                if "THRESHOLD_" in key:
+                if key not in ['kpi_id', 'window']:
                     response.alarms[key] = threshold
 
             yield response