diff --git a/plugins/analytics/client/numbers/index.vue b/plugins/analytics/client/numbers/index.vue
index 6353bf78..6b9c0295 100644
--- a/plugins/analytics/client/numbers/index.vue
+++ b/plugins/analytics/client/numbers/index.vue
@@ -15,7 +15,7 @@
         <numeric icon="analytic:heart" title="今日 DAU">
           <template #default>{{ store.analytics.dauHistory[0] }}</template>
           <template #footer-left>近期 DAU</template>
-          <template #footer-right>{{ +(store.analytics.dauHistory.slice(1).reduce((a, b) => a + b, 0) / 7).toFixed(1) }}</template>
+          <template #footer-right>{{ +recentDau.toFixed(1) }}</template>
         </numeric>
       </k-slot-item>
     </k-slot>
@@ -24,13 +24,20 @@
 
 <script setup lang="ts">
 
-import { provide } from 'vue'
+import { provide, computed } from 'vue'
 import { store } from '@koishijs/client'
 import {} from '@koishijs/plugin-analytics/src'
 import Numeric from './numeric.vue'
 
 provide('component:analytic-number', Numeric)
 
+const recentDau = computed(() => {
+  const data = store.analytics.dauHistory.slice(1)
+  const historyLength = store.analytics.dauHistory.length - 1
+  if (!historyLength) return 0
+  return data.reduce((a, b) => a + b, 0) / Math.min(data.length, historyLength)
+})
+
 </script>
 
 <style lang="scss" scoped>
diff --git a/plugins/analytics/package.json b/plugins/analytics/package.json
index 141fef2d..4b82aa4c 100644
--- a/plugins/analytics/package.json
+++ b/plugins/analytics/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@koishijs/plugin-analytics",
   "description": "Show statistics for Koishi application",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
diff --git a/plugins/analytics/src/index.ts b/plugins/analytics/src/index.ts
index 220fde65..423321aa 100644
--- a/plugins/analytics/src/index.ts
+++ b/plugins/analytics/src/index.ts
@@ -148,7 +148,7 @@ class Analytics extends DataService<Analytics.Payload> {
     }
   }
 
-  private async getCommandRate() {
+  private async getCommandRate(lengthTask: Promise<number>) {
     const data = await this.ctx.database
       .select('analytics.command', {
         date: this.queryRecent(),
@@ -157,9 +157,10 @@ class Analytics extends DataService<Analytics.Payload> {
         count: row => $.sum(row.count),
       })
       .execute()
+    const length = await lengthTask
     const result = {} as Dict<number>
     data.forEach((stat) => {
-      result[stat.name] = stat.count / this.config.recentDayCount
+      result[stat.name] = stat.count / length
     })
     return result
   }
@@ -167,14 +168,14 @@ class Analytics extends DataService<Analytics.Payload> {
   private async getDauHistory() {
     const data = await this.ctx.database
       .select('analytics.command', {
-        date: { $gte: Time.getDateNumber() - 7 },
+        date: { $gte: Time.getDateNumber() - this.config.recentDayCount },
         userId: { $gt: 0 },
       })
       .groupBy(['date'], {
         count: row => $.count(row.userId),
       })
       .execute()
-    const result: number[] = new Array(8).fill(0)
+    const result: number[] = new Array(this.config.recentDayCount + 1).fill(0)
     const today = Time.getDateNumber()
     data.forEach((stat) => {
       result[today - stat.date] = stat.count
@@ -182,7 +183,7 @@ class Analytics extends DataService<Analytics.Payload> {
     return result
   }
 
-  private async getMessageByBot() {
+  private async getMessageByBot(lengthTask: Promise<number>) {
     const data = await this.ctx.database
       .select('analytics.message', {
         date: this.queryRecent(),
@@ -191,6 +192,7 @@ class Analytics extends DataService<Analytics.Payload> {
         count: row => $.sum(row.count),
       })
       .execute()
+    const length = await lengthTask
     const result = {} as Dict<Dict<MessageStats & Universal.User>>
     data.forEach((stat) => {
       const entry = (result[stat.platform] ||= {})[stat.selfId] ||= {
@@ -198,14 +200,16 @@ class Analytics extends DataService<Analytics.Payload> {
         send: 0,
         receive: 0,
       }
-      entry[stat.type] = stat.count / this.config.recentDayCount
+      entry[stat.type] = stat.count / length
     })
     return result
   }
 
   private async getMessageByDate() {
     const data = await this.ctx.database
-      .select('analytics.message')
+      .select('analytics.message', {
+        date: { $lt: Time.getDateNumber() },
+      })
       .groupBy(['type', 'date'], {
         count: row => $.sum(row.count),
       })
@@ -217,10 +221,13 @@ class Analytics extends DataService<Analytics.Payload> {
       const entry = result[today - stat.date] ||= { send: 0, receive: 0 }
       entry[stat.type] = stat.count
     })
+    for (let i = 0; i < result.length; i++) {
+      result[i] ||= { send: 0, receive: 0 }
+    }
     return result
   }
 
-  private async getMessageByHour() {
+  private async getMessageByHour(lengthTask: Promise<number>) {
     const data = await this.ctx.database
       .select('analytics.message', {
         date: this.queryRecent(),
@@ -229,14 +236,19 @@ class Analytics extends DataService<Analytics.Payload> {
         count: row => $.sum(row.count),
       })
       .execute()
+    const length = await lengthTask
     const result = new Array(24).fill(null).map(() => ({ send: 0, receive: 0 }))
     data.forEach((stat) => {
-      result[stat.hour][stat.type] = stat.count / this.config.recentDayCount
+      result[stat.hour][stat.type] = stat.count / length
     })
     return result
   }
 
   async download(): Promise<Analytics.Payload> {
+    const messageByDateTask = this.getMessageByDate()
+    const lengthTask = messageByDateTask.then((data) => {
+      return Math.min(Math.max(data.length - 1, 1), this.config.recentDayCount)
+    })
     const [
       userCount,
       userIncrement,
@@ -261,11 +273,11 @@ class Analytics extends DataService<Analytics.Payload> {
         $.gte(row.createdAt, Time.fromDateNumber(Time.getDateNumber() - 1)),
         $.lt(row.createdAt, Time.fromDateNumber(Time.getDateNumber())),
       )),
-      this.getCommandRate(),
+      this.getCommandRate(lengthTask),
       this.getDauHistory(),
-      this.getMessageByBot(),
-      this.getMessageByDate(),
-      this.getMessageByHour(),
+      this.getMessageByBot(lengthTask),
+      messageByDateTask,
+      this.getMessageByHour(lengthTask),
     ])
     return {
       userCount,