diff --git a/src/AmsToMqttBridge.cpp b/src/AmsToMqttBridge.cpp
index b65d8fca..f69c7bc6 100644
--- a/src/AmsToMqttBridge.cpp
+++ b/src/AmsToMqttBridge.cpp
@@ -545,7 +545,7 @@ void loop() {
 				debugW_P(PSTR("Used %dms to read HAN port (false)"), millis()-start);
 			}
 		}
-		if(!ds.isHappy() && now - meterState.getLastUpdateMillis() > 1800000) {
+		if(millis() - meterState.getLastUpdateMillis() > 1800000 && !ds.isHappy()) {
 			handleClear(now);
 		}
 	} catch(const std::exception& e) {