diff --git a/code/espurna/mqtt.ino b/code/espurna/mqtt.ino
index 2f3b402d..51b15ae8 100644
--- a/code/espurna/mqtt.ino
+++ b/code/espurna/mqtt.ino
@@ -345,10 +345,8 @@ void _mqttCallback(unsigned int type, const char * topic, const char * payload)
         // Subscribe to internal action topics
         mqttSubscribe(MQTT_TOPIC_ACTION);
 
-        // Send heartbeat messages
-        #if HEARTBEAT_ENABLED
-            heartbeat();
-        #endif
+        // Flag system to send heartbeat
+        systemSendHeartbeat();
 
     }
 
diff --git a/code/espurna/system.ino b/code/espurna/system.ino
index 8f21c75e..5002c26d 100644
--- a/code/espurna/system.ino
+++ b/code/espurna/system.ino
@@ -11,6 +11,7 @@ Copyright (C) 2018 by Xose Pérez <xose dot perez at gmail dot com>
 // -----------------------------------------------------------------------------
 
 unsigned long _loopDelay = 0;
+bool _system_send_heartbeat = false;
 
 // -----------------------------------------------------------------------------
 
@@ -58,6 +59,10 @@ void systemCheckLoop() {
 
 // -----------------------------------------------------------------------------
 
+void systemSendHeartbeat() {
+    _system_send_heartbeat = true;
+}
+
 void systemLoop() {
 
     // Check system stability
@@ -68,7 +73,8 @@ void systemLoop() {
     #if HEARTBEAT_ENABLED
         // Heartbeat
         static unsigned long last = 0;
-        if ((last == 0) || (millis() - last > HEARTBEAT_INTERVAL)) {
+        if (_system_send_heartbeat || (last == 0) || (millis() - last > HEARTBEAT_INTERVAL)) {
+            _system_send_heartbeat = false;
             last = millis();
             heartbeat();
         }