diff --git a/kwollect/db/kwollect_setup_db.py b/kwollect/db/kwollect_setup_db.py
index b9c6bac0aa4074406eb1a01427994e02174c1b27..d9bb2c6d7337efac9ca6d2fba9325105d924add9 100644
--- a/kwollect/db/kwollect_setup_db.py
+++ b/kwollect/db/kwollect_setup_db.py
@@ -387,7 +387,7 @@ if as_rate:
   "END / EXTRACT(epoch FROM timestamp - LAG(timestamp) OVER w) AS value, " \
   "labels " \
 "FROM cte " \
-"WINDOW w AS (PARTITION BY metric_id, device_id, labels) "\
+"WINDOW w AS (PARTITION BY metric_id, device_id, labels ORDER BY timestamp ASC) "\
 "ORDER BY timestamp ASC"
 
 plpy.info(req)