diff --git a/app/Repositories/Metric/MetricRepository.php b/app/Repositories/Metric/MetricRepository.php
index c424336b19cd..533b5fe506f3 100644
--- a/app/Repositories/Metric/MetricRepository.php
+++ b/app/Repositories/Metric/MetricRepository.php
@@ -71,7 +71,7 @@ public function listPointsLastHour(Metric $metric)
 
         for ($i = 0; $i < $timeframe; $i++) {
             if (!$points->has($pointKey)) {
-                if ($i >= $metric->threshold) {
+                if ($minutesWithNoData >= $metric->threshold) {
                     $points->put($pointKey, $metric->default_value);
                     //We put default value as metric, so we can reset counter for minutes without data
                     $minutesWithNoData = 0;