diff --git a/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ResourceMetricsRepoService.java b/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ResourceMetricsRepoService.java
index 70feca732a32c6d6bdac9890570ec24e79a53844..02d26d518a6828de96b3cd36415aba2c75dac6e3 100644
--- a/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ResourceMetricsRepoService.java
+++ b/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ResourceMetricsRepoService.java
@@ -37,6 +37,7 @@ public class ResourceMetricsRepoService {
         List<Object[]> rawResults = resourceRepository.groupByStateBetweenDates(starttime, endtime);
 
         return rawResults.stream()
+                .filter(row -> row[0] != null)
                 .collect(Collectors.toMap(
                         row -> row[0].toString(),
                         row -> ((Number) row[1]).intValue()
diff --git a/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceMetricsRepoService.java b/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceMetricsRepoService.java
index ef910dce296959d123368acaeccffb72fca095e8..542ea87c7572d05bf7d1debc0f300d750f550ff4 100644
--- a/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceMetricsRepoService.java
+++ b/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceMetricsRepoService.java
@@ -36,6 +36,7 @@ public class ServiceMetricsRepoService {
         List<Object[]> rawResults = serviceRepo.groupByStateBetweenDates(starttime, endtime);
 
         return rawResults.stream()
+                .filter(row -> row[0] != null)
                 .collect(Collectors.toMap(
                         row -> row[0].toString(),
                         row -> ((Number) row[1]).intValue()
diff --git a/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceOrderMetricsRepoService.java b/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceOrderMetricsRepoService.java
index 9bd49793b0f0c264fe72b1231300313c7a406aa6..72730dd944cbba6e735adcbea387ffb43e347592 100644
--- a/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceOrderMetricsRepoService.java
+++ b/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceOrderMetricsRepoService.java
@@ -70,6 +70,7 @@ public class ServiceOrderMetricsRepoService {
         List<Object[]> rawResults = serviceOrderRepository.groupByStateBetweenDates(starttime, endtime);
 
         return rawResults.stream()
+                .filter(row -> row[0] != null)
                 .collect(Collectors.toMap(
                         row -> row[0].toString(),
                         row -> ((Number) row[1]).intValue()