diff --git a/app/Repositories/Metric/PgSqlRepository.php b/app/Repositories/Metric/PgSqlRepository.php
index e08f3af1..7e7514cb 100644
--- a/app/Repositories/Metric/PgSqlRepository.php
+++ b/app/Repositories/Metric/PgSqlRepository.php
@@ -41,7 +41,7 @@ class PgSqlRepository implements MetricInterface
             $queryType = 'sum(metric_points.value)';
         }
 
-        $query = DB::select("select {$queryType} as aggregate FROM metrics JOIN metric_points ON metric_points.metric_id = metrics.id WHERE metrics.id = :metric_id AND to_char(metric_points.created_at, 'YYYYMMDDHHMI') = :timestamp GROUP BY to_char(metric_points.created_at, 'HHMI')", [
+        $query = DB::select("select {$queryType} as aggregate FROM metrics JOIN metric_points ON metric_points.metric_id = metrics.id WHERE metrics.id = :metric_id AND to_char(metric_points.created_at, 'YYYYMMDDHH24MI') = :timestamp GROUP BY to_char(metric_points.created_at, 'HHMI')", [
             'metric_id' => $metric->id,
             'timestamp' => $hourInterval,
         ]);
diff --git a/app/Repositories/Metric/SqliteRepository.php b/app/Repositories/Metric/SqliteRepository.php
index 112aaab3..b2fd5af9 100644
--- a/app/Repositories/Metric/SqliteRepository.php
+++ b/app/Repositories/Metric/SqliteRepository.php
@@ -33,8 +33,8 @@ class SqliteRepository implements MetricInterface
         $hourInterval = $dateTime->format('YmdHi');
 
         $points = $metric->points()
-                    ->whereRaw('strftime("%Y%m%d%H%i", created_at) = "'.$hourInterval.'"')
-                    ->groupBy(DB::raw('strftime("%H%i", created_at)'));
+                    ->whereRaw('strftime("%Y%m%d%H%M", created_at) = "'.$hourInterval.'"')
+                    ->groupBy(DB::raw('strftime("%H%M", created_at)'));
 
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
             $value = $points->sum('value');