diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py
index c265d2c9df3b9823b6116309a27ca3270fdd2667..20a536b4a2f271b6963d868afadd7323a15fa895 100644
--- a/src/monitoring/service/MonitoringServiceServicerImpl.py
+++ b/src/monitoring/service/MonitoringServiceServicerImpl.py
@@ -604,10 +604,13 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer):
                         f"LATEST ON timestamp PARTITION BY kpi_id"
                 data = self.metrics_db.run_query(query)[0]
                 LOGGER.debug(data)
-
-                response.kpi_id.kpi_id.uuid = str(data[0])
-                response.timestamp.timestamp = timestamp_string_to_float(data[1])
-                response.kpi_value.floatVal = data[2]  # This must be improved
+                if len(data) == 0:
+                    response.kpi_id.kpi_id.uuid = request.kpi_id.uuid
+                else:
+                    data = data[0]
+                    response.kpi_id.kpi_id.uuid = str(data[0])
+                    response.timestamp.timestamp = timestamp_string_to_float(data[1])
+                    response.kpi_value.floatVal = data[2]
 
             return response
         except ServiceException as e: