diff --git a/lib/Hoymiles/src/Hoymiles.cpp b/lib/Hoymiles/src/Hoymiles.cpp
index 595a096..d138e4f 100644
--- a/lib/Hoymiles/src/Hoymiles.cpp
+++ b/lib/Hoymiles/src/Hoymiles.cpp
@@ -53,6 +53,11 @@ void HoymilesClass::loop()
 
             if (iv != nullptr && iv->getRadio()->isInitialized() && iv->getRadio()->isQueueEmpty()) {
 
+                if (iv->getZeroValuesIfUnreachable() && !iv->isReachable()) {
+                    Hoymiles.getMessageOutput()->println("Set runtime data to zero");
+                    iv->Statistics()->zeroRuntimeData();
+                }
+
                 if (iv->getEnablePolling() || iv->getEnableCommands()) {
                     _messageOutput->print("Fetch inverter: ");
                     _messageOutput->println(iv->serial(), HEX);
diff --git a/lib/Hoymiles/src/commands/RealTimeRunDataCommand.cpp b/lib/Hoymiles/src/commands/RealTimeRunDataCommand.cpp
index e5ece40..3f0aed3 100644
--- a/lib/Hoymiles/src/commands/RealTimeRunDataCommand.cpp
+++ b/lib/Hoymiles/src/commands/RealTimeRunDataCommand.cpp
@@ -55,9 +55,4 @@ bool RealTimeRunDataCommand::handleResponse(InverterAbstract* inverter, fragment
 void RealTimeRunDataCommand::gotTimeout(InverterAbstract* inverter)
 {
     inverter->Statistics()->incrementRxFailureCount();
-
-    if (inverter->getZeroValuesIfUnreachable() && !inverter->isReachable()) {
-        Hoymiles.getMessageOutput()->println("Set runtime data to zero");
-        inverter->Statistics()->zeroRuntimeData();
-    }
 }
\ No newline at end of file