diff --git a/include/MqttPublishing.h b/include/MqttPublishing.h
index b43a5a6..e42472a 100644
--- a/include/MqttPublishing.h
+++ b/include/MqttPublishing.h
@@ -14,6 +14,7 @@ private:
     void publishField(String subtopic, std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId);
 
     uint32_t _lastPublishStats[INV_MAX_COUNT];
+    uint32_t _lastPublish;
 };
 
 extern MqttPublishingClass MqttPublishing;
\ No newline at end of file
diff --git a/lib/Hoymiles/src/Hoymiles.cpp b/lib/Hoymiles/src/Hoymiles.cpp
index 919db46..3fd611d 100644
--- a/lib/Hoymiles/src/Hoymiles.cpp
+++ b/lib/Hoymiles/src/Hoymiles.cpp
@@ -19,8 +19,7 @@ void HoymilesClass::loop()
     _radio->loop();
 
     if (getNumInverters() > 0) {
-        EVERY_N_SECONDS(_pollInterval)
-        {
+        if (millis() - _lastPoll > (_pollInterval * 1000)) {
             static uint8_t inverterPos = 0;
 
             std::shared_ptr<InverterAbstract> iv = getInverterByPos(inverterPos);
@@ -42,6 +41,8 @@ void HoymilesClass::loop()
             if (++inverterPos >= getNumInverters()) {
                 inverterPos = 0;
             }
+
+            _lastPoll = millis();
         }
     }
 }
diff --git a/lib/Hoymiles/src/Hoymiles.h b/lib/Hoymiles/src/Hoymiles.h
index 0ed5823..4064690 100644
--- a/lib/Hoymiles/src/Hoymiles.h
+++ b/lib/Hoymiles/src/Hoymiles.h
@@ -29,6 +29,7 @@ private:
     std::unique_ptr<HoymilesRadio> _radio;
 
     uint32_t _pollInterval;
+    uint32_t _lastPoll = 0;
 };
 
 extern HoymilesClass Hoymiles;
\ No newline at end of file
diff --git a/src/MqttPublishing.cpp b/src/MqttPublishing.cpp
index c225c8c..489d5f5 100644
--- a/src/MqttPublishing.cpp
+++ b/src/MqttPublishing.cpp
@@ -16,8 +16,7 @@ void MqttPublishingClass::loop()
 
     CONFIG_T& config = Configuration.get();
 
-    EVERY_N_SECONDS(config.Dtu_PollInterval)
-    {
+    if (millis() - _lastPublish > (config.Dtu_PollInterval * 1000)) {
         MqttSettings.publish("dtu/uptime", String(millis() / 1000));
         MqttSettings.publish("dtu/ip", WiFi.localIP().toString());
 
@@ -58,6 +57,8 @@ void MqttPublishingClass::loop()
 
             yield();
         }
+
+        _lastPublish = millis();
     }
 }