diff --git a/src/services/storage/metricsEventStorage.ts b/src/services/storage/metricsEventStorage.ts
index 058c4a94..0fe8db0a 100644
--- a/src/services/storage/metricsEventStorage.ts
+++ b/src/services/storage/metricsEventStorage.ts
@@ -25,8 +25,6 @@ export default class {
         process.on('exit', () => {
             this.persistCache()
         });
-
-
     }
 
     getlast24hCache = () => { return this.last24hCache }
@@ -78,7 +76,7 @@ export default class {
 
     }
 
-    LoadLatestMetrics = async (limit = 100): Promise<Types.UsageMetrics> => {
+    LoadLatestMetrics = async (limit = 30): Promise<Types.UsageMetrics> => {
         const raw = this.tlvStorage.LoadLatest(limit)
         const metrics: Types.UsageMetrics = { apps: {} }
         Object.keys(raw).forEach(app => {
diff --git a/src/services/storage/tlvFilesStorage.ts b/src/services/storage/tlvFilesStorage.ts
index 2ba66201..c4ad58d2 100644
--- a/src/services/storage/tlvFilesStorage.ts
+++ b/src/services/storage/tlvFilesStorage.ts
@@ -46,7 +46,7 @@ export class TlvFilesStorage {
         this.pending[appId][dataName].tlvs.push(tlv)
     }
 
-    LoadLatest = (limit = 100): LatestData => {
+    LoadLatest = (limit = 30): LatestData => {
         this.persist()
         const data: LatestData = {}
         this.foreachFile((app, dataName, tlvFiles) => {