diff --git a/lib/Hoymiles/src/Hoymiles.cpp b/lib/Hoymiles/src/Hoymiles.cpp
index a4558ac..937be53 100644
--- a/lib/Hoymiles/src/Hoymiles.cpp
+++ b/lib/Hoymiles/src/Hoymiles.cpp
@@ -40,105 +40,107 @@ void HoymilesClass::loop()
     _radioNrf->loop();
     _radioCmt->loop();
 
-    if (getNumInverters() > 0) {
-        if (millis() - _lastPoll > (_pollInterval * 1000)) {
-            static uint8_t inverterPos = 0;
+    if (getNumInverters() == 0) {
+        return;
+    }
 
-            std::shared_ptr<InverterAbstract> iv = getInverterByPos(inverterPos);
-            if ((iv == nullptr) || ((iv != nullptr) && (!iv->getRadio()->isInitialized()))) {
-                if (++inverterPos >= getNumInverters()) {
-                    inverterPos = 0;
-                }
+    if (millis() - _lastPoll > (_pollInterval * 1000)) {
+        static uint8_t inverterPos = 0;
+
+        std::shared_ptr<InverterAbstract> iv = getInverterByPos(inverterPos);
+        if ((iv == nullptr) || ((iv != nullptr) && (!iv->getRadio()->isInitialized()))) {
+            if (++inverterPos >= getNumInverters()) {
+                inverterPos = 0;
+            }
+        }
+
+        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 != nullptr && iv->getRadio()->isInitialized() && iv->getRadio()->isQueueEmpty()) {
+            if (iv->getEnablePolling() || iv->getEnableCommands()) {
+                _messageOutput->print("Fetch inverter: ");
+                _messageOutput->println(iv->serial(), HEX);
 
-                if (iv->getZeroValuesIfUnreachable() && !iv->isReachable()) {
-                    Hoymiles.getMessageOutput()->println("Set runtime data to zero");
-                    iv->Statistics()->zeroRuntimeData();
+                if (!iv->isReachable()) {
+                    iv->sendChangeChannelRequest();
                 }
 
-                if (iv->getEnablePolling() || iv->getEnableCommands()) {
-                    _messageOutput->print("Fetch inverter: ");
-                    _messageOutput->println(iv->serial(), HEX);
+                iv->sendStatsRequest();
 
-                    if (!iv->isReachable()) {
-                        iv->sendChangeChannelRequest();
-                    }
+                // Fetch event log
+                bool force = iv->EventLog()->getLastAlarmRequestSuccess() == CMD_NOK;
+                iv->sendAlarmLogRequest(force);
 
-                    iv->sendStatsRequest();
-
-                    // Fetch event log
-                    bool force = iv->EventLog()->getLastAlarmRequestSuccess() == CMD_NOK;
-                    iv->sendAlarmLogRequest(force);
-
-                    // Fetch limit
-                    if (((millis() - iv->SystemConfigPara()->getLastUpdateRequest() > HOY_SYSTEM_CONFIG_PARA_POLL_INTERVAL)
-                            && (millis() - iv->SystemConfigPara()->getLastUpdateCommand() > HOY_SYSTEM_CONFIG_PARA_POLL_MIN_DURATION))) {
-                        _messageOutput->println("Request SystemConfigPara");
-                        iv->sendSystemConfigParaRequest();
-                    }
-
-                    // Set limit if required
-                    if (iv->SystemConfigPara()->getLastLimitCommandSuccess() == CMD_NOK) {
-                        _messageOutput->println("Resend ActivePowerControl");
-                        iv->resendActivePowerControlRequest();
-                    }
-
-                    // Set power status if required
-                    if (iv->PowerCommand()->getLastPowerCommandSuccess() == CMD_NOK) {
-                        _messageOutput->println("Resend PowerCommand");
-                        iv->resendPowerControlRequest();
-                    }
-
-                    // Fetch dev info (but first fetch stats)
-                    if (iv->Statistics()->getLastUpdate() > 0) {
-                        bool invalidDevInfo = !iv->DevInfo()->containsValidData()
-                            && iv->DevInfo()->getLastUpdateAll() > 0
-                            && iv->DevInfo()->getLastUpdateSimple() > 0;
-
-                        if (invalidDevInfo) {
-                            _messageOutput->println("DevInfo: No Valid Data");
-                        }
-
-                        if ((iv->DevInfo()->getLastUpdateAll() == 0)
-                            || (iv->DevInfo()->getLastUpdateSimple() == 0)
-                            || invalidDevInfo) {
-                            _messageOutput->println("Request device info");
-                            iv->sendDevInfoRequest();
-                        }
-                    }
-
-                    // Fetch grid profile
-                    if (iv->Statistics()->getLastUpdate() > 0 && iv->GridProfile()->getLastUpdate() == 0) {
-                        iv->sendGridOnProFileParaRequest();
-                    }
-
-                    _lastPoll = millis();
+                // Fetch limit
+                if (((millis() - iv->SystemConfigPara()->getLastUpdateRequest() > HOY_SYSTEM_CONFIG_PARA_POLL_INTERVAL)
+                        && (millis() - iv->SystemConfigPara()->getLastUpdateCommand() > HOY_SYSTEM_CONFIG_PARA_POLL_MIN_DURATION))) {
+                    _messageOutput->println("Request SystemConfigPara");
+                    iv->sendSystemConfigParaRequest();
                 }
 
-                if (++inverterPos >= getNumInverters()) {
-                    inverterPos = 0;
+                // Set limit if required
+                if (iv->SystemConfigPara()->getLastLimitCommandSuccess() == CMD_NOK) {
+                    _messageOutput->println("Resend ActivePowerControl");
+                    iv->resendActivePowerControlRequest();
                 }
+
+                // Set power status if required
+                if (iv->PowerCommand()->getLastPowerCommandSuccess() == CMD_NOK) {
+                    _messageOutput->println("Resend PowerCommand");
+                    iv->resendPowerControlRequest();
+                }
+
+                // Fetch dev info (but first fetch stats)
+                if (iv->Statistics()->getLastUpdate() > 0) {
+                    bool invalidDevInfo = !iv->DevInfo()->containsValidData()
+                        && iv->DevInfo()->getLastUpdateAll() > 0
+                        && iv->DevInfo()->getLastUpdateSimple() > 0;
+
+                    if (invalidDevInfo) {
+                        _messageOutput->println("DevInfo: No Valid Data");
+                    }
+
+                    if ((iv->DevInfo()->getLastUpdateAll() == 0)
+                        || (iv->DevInfo()->getLastUpdateSimple() == 0)
+                        || invalidDevInfo) {
+                        _messageOutput->println("Request device info");
+                        iv->sendDevInfoRequest();
+                    }
+                }
+
+                // Fetch grid profile
+                if (iv->Statistics()->getLastUpdate() > 0 && iv->GridProfile()->getLastUpdate() == 0) {
+                    iv->sendGridOnProFileParaRequest();
+                }
+
+                _lastPoll = millis();
             }
 
-            // Perform housekeeping of all inverters on day change
-            int8_t currentWeekDay = Utils::getWeekDay();
-            static int8_t lastWeekDay = -1;
-            if (lastWeekDay == -1) {
+            if (++inverterPos >= getNumInverters()) {
+                inverterPos = 0;
+            }
+        }
+
+        // Perform housekeeping of all inverters on day change
+        int8_t currentWeekDay = Utils::getWeekDay();
+        static int8_t lastWeekDay = -1;
+        if (lastWeekDay == -1) {
+            lastWeekDay = currentWeekDay;
+        } else {
+            if (currentWeekDay != lastWeekDay) {
+
+                for (auto& inv : _inverters) {
+                    if (inv->getZeroYieldDayOnMidnight()) {
+                        inv->Statistics()->zeroDailyData();
+                    }
+                    inv->Statistics()->resetYieldDayCorrection();
+                }
+
                 lastWeekDay = currentWeekDay;
-            } else {
-                if (currentWeekDay != lastWeekDay) {
-
-                    for (auto& inv : _inverters) {
-                        if (inv->getZeroYieldDayOnMidnight()) {
-                            inv->Statistics()->zeroDailyData();
-                        }
-                        inv->Statistics()->resetYieldDayCorrection();
-                    }
-
-                    lastWeekDay = currentWeekDay;
-                }
             }
         }
     }