diff --git a/userapi/storage/postgres/stats_table.go b/userapi/storage/postgres/stats_table.go
index b90b5be6b..c58f2183a 100644
--- a/userapi/storage/postgres/stats_table.go
+++ b/userapi/storage/postgres/stats_table.go
@@ -64,7 +64,7 @@ const upsertDailyMessagesSQL = `
 	DO UPDATE SET
 	    messages=u.messages+excluded.messages, sent_messages=u.sent_messages+excluded.sent_messages,
 	    e2ee_messages=u.e2ee_messages+excluded.e2ee_messages, sent_e2ee_messages=u.sent_e2ee_messages+excluded.sent_e2ee_messages,
-		active_rooms=$7, active_e2ee_rooms=$8
+		active_rooms=GREATEST($7, u.active_rooms), active_e2ee_rooms=GREATEST($8, u.active_e2ee_rooms)
 `
 
 const selectDailyMessagesSQL = `
diff --git a/userapi/storage/sqlite3/stats_table.go b/userapi/storage/sqlite3/stats_table.go
index 614d93d3a..7547cd8e5 100644
--- a/userapi/storage/sqlite3/stats_table.go
+++ b/userapi/storage/sqlite3/stats_table.go
@@ -64,7 +64,7 @@ const upsertDailyMessagesSQL = `
 	DO UPDATE SET
 	    messages=messages+excluded.messages, sent_messages=sent_messages+excluded.sent_messages,
 	    e2ee_messages=e2ee_messages+excluded.e2ee_messages, sent_e2ee_messages=sent_e2ee_messages+excluded.sent_e2ee_messages,
-	    active_rooms=$7, active_e2ee_rooms=$8
+	    active_rooms=MAX($7, active_rooms), active_e2ee_rooms=MAX($8, active_e2ee_rooms)
 `
 
 const selectDailyMessagesSQL = `