diff --git a/src/ebusd/mqtthandler.cpp b/src/ebusd/mqtthandler.cpp
index de70fba2..48211b77 100755
--- a/src/ebusd/mqtthandler.cpp
+++ b/src/ebusd/mqtthandler.cpp
@@ -1777,7 +1777,7 @@ void MqttHandler::publishMessage(const Message* message, ostringstream* updates,
         *updates << "\"circuit\":\"" << message->getCircuit() << "\",\"name\":\"" << message->getName()
                  << "\",\"fields\":{";
       }
-    } else {
+    } else if (m_staticTopic) {
       *updates << message->getCircuit() << UI_FIELD_SEPARATOR << message->getName() << UI_FIELD_SEPARATOR;
     }
     result_t result = message->decodeLastData(false, nullptr, -1, outputFormat, updates);