diff --git a/code/espurna/mqtt.ino b/code/espurna/mqtt.ino
index 21c6c9f1..151fcd64 100644
--- a/code/espurna/mqtt.ino
+++ b/code/espurna/mqtt.ino
@@ -211,6 +211,8 @@ void _mqttOnDisconnect() {
 
 void _mqttOnMessage(char* topic, char* payload, unsigned int len) {
 
+    if (len == 0) return;
+
     char message[len + 1];
     strlcpy(message, (char *) payload, len + 1);