diff --git a/src/AmsDataStorage.cpp b/src/AmsDataStorage.cpp
index de81f6e1..4aaddc98 100644
--- a/src/AmsDataStorage.cpp
+++ b/src/AmsDataStorage.cpp
@@ -102,7 +102,7 @@ bool AmsDataStorage::update(AmsData* data) {
     bool ret = false;
 
     // Update day plot
-    if(ltz.Minute > 0) {
+    if(!isDayHappy()) {
         if(day.activeImport == 0 || now - day.lastMeterReadTime > 86400) {
             day.activeImport = data->getActiveImportCounter() * 1000;
             day.activeExport = data->getActiveExportCounter() * 1000;
@@ -159,7 +159,7 @@ bool AmsDataStorage::update(AmsData* data) {
     }
 
     // Update month plot
-    if(ltz.Hour == 0) {
+    if(ltz.Hour == 0 && !isMonthHappy()) {
         if(month.activeImport == 0 || now - month.lastMeterReadTime > 2678400) {
             month.activeImport = data->getActiveImportCounter() * 1000;
             month.activeExport = data->getActiveExportCounter() * 1000;
@@ -333,21 +333,56 @@ bool AmsDataStorage::setMonthData(MonthDataPoints& month) {
 }
 
 bool AmsDataStorage::isHappy() {
+    return isDayHappy() && isMonthHappy();
+}
+
+bool AmsDataStorage::isDayHappy() {
     time_t now = time(nullptr);
     if(now < BUILD_EPOCH) return false;
     tmElements_t tm, last;
 
-    if(now < day.lastMeterReadTime) return false;
-    if(now-day.lastMeterReadTime > 3600) return false;
-    breakTime(now, tm);
-    breakTime(day.lastMeterReadTime, last);
-    if(tm.Hour > last.Hour) return false;
-    
-    if(now < month.lastMeterReadTime) return false;
-    if(now-month.lastMeterReadTime > 86400) return false;
-    breakTime(now, tm);
-    breakTime(month.lastMeterReadTime, last);
-    if(tm.Day > last.Day) return false;
+    if(now < day.lastMeterReadTime) {
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Day %lu < %lu\n", now, day.lastMeterReadTime);
+        return false;
+    }
+    if(now-day.lastMeterReadTime > 3600) {
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Day %lu - %lu > 3600\n", now, day.lastMeterReadTime);
+        return false;
+    }
+    breakTime(tz->toLocal(now), tm);
+    breakTime(tz->toLocal(day.lastMeterReadTime), last);
+    if(tm.Hour > last.Hour) {
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Day %d > %d\n", tm.Hour, last.Hour);
+        return false;
+    }
+
+    return true;
+}
+
+bool AmsDataStorage::isMonthHappy() {
+    if(tz == NULL) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Timezone is missing\n");
+        return false;
+    }
+
+    time_t now = time(nullptr);
+    if(now < BUILD_EPOCH) return false;
+    tmElements_t tm, last;
+    
+    if(now < month.lastMeterReadTime) {
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Month %lu < %lu\n", now, month.lastMeterReadTime);
+        return false;
+    }
+    if(now-month.lastMeterReadTime > 86400) {
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Month %lu - %lu > 3600\n", now, month.lastMeterReadTime);
+        return false;
+    }
+    breakTime(tz->toLocal(now), tm);
+    breakTime(tz->toLocal(month.lastMeterReadTime), last);
+    if(tm.Day > last.Day) {
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(AmsDataStorage) Month %d > %d\n", tm.Day, last.Day);
+        return false;
+    }
 
     return true;
 }
diff --git a/src/AmsDataStorage.h b/src/AmsDataStorage.h
index a898bc39..a566b97e 100644
--- a/src/AmsDataStorage.h
+++ b/src/AmsDataStorage.h
@@ -37,6 +37,8 @@ public:
     bool setMonthData(MonthDataPoints&);
 
     bool isHappy();
+    bool isDayHappy();
+    bool isMonthHappy();
 
 private:
     Timezone* tz;
diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino
index b0275669..ae3683df 100644
--- a/src/AmsToMqttBridge.ino
+++ b/src/AmsToMqttBridge.ino
@@ -914,15 +914,18 @@ bool readHanPort() {
 
 		bool saveData = false;
 		if(!ds.isHappy() && now > BUILD_EPOCH) {
+			debugD("Its time to update data storage");
 			tmElements_t tm;
 			breakTime(now, tm);
 			if(tm.Minute == 0) {
+				debugD(" using actual data");
 				saveData = ds.update(&data);
-			} else if(tm.Minute == 1) {
+			} else if(meterState.getListType() >= 3) {
+				debugD(" using estimated data");
 				saveData = ds.update(&meterState);
 			}
 			if(saveData) {
-				debugI("Saving day plot");
+				debugI("Saving data");
 				ds.save();
 			}
 		}