diff --git a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/storage/ClickHouseMetricsQueryStore.java b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/storage/ClickHouseMetricsQueryStore.java
index fd18a0a6..5dde1cab 100644
--- a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/storage/ClickHouseMetricsQueryStore.java
+++ b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/storage/ClickHouseMetricsQueryStore.java
@@ -88,8 +88,9 @@ public class ClickHouseMetricsQueryStore implements MetricsQueryStore {
 
         String finalSql = """
             SELECT bucket, metric_name,
-                   greatest(0, max_val - lag(max_val, 1, max_val)
-                       OVER (PARTITION BY metric_name ORDER BY bucket)) AS avg_value
+                   greatest(0, max_val - lagInFrame(max_val, 1, max_val)
+                       OVER (PARTITION BY metric_name ORDER BY bucket
+                       ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)) AS avg_value
             FROM (
                 SELECT toStartOfInterval(collected_at, INTERVAL %d SECOND) AS bucket,
                        metric_name,