diff --git a/apps/aqhome-mqttlog/init.c b/apps/aqhome-mqttlog/init.c
index f91b77d..fcc8983 100644
--- a/apps/aqhome-mqttlog/init.c
+++ b/apps/aqhome-mqttlog/init.c
@@ -268,6 +268,9 @@ int _setupMqtt(AQHOME_MQTT *aqh, GWEN_DB_NODE *dbArgs)
     mqttPort=GWEN_DB_GetIntValue(dbArgs, "ConfigFile/mqttPort", 0, 1883);
 
   mqttClientId=GWEN_DB_GetCharValue(dbArgs, "mqttClientId", 0, "aqhome-mqttlog");
+  if (!(mqttClientId && *mqttClientId))
+    mqttClientId=GWEN_DB_GetCharValue(dbArgs, "ConfigFile/mqttClientId", 0, "aqhome-mqttlog");
+
   mqttKeepAlive=GWEN_DB_GetIntValue(dbArgs, "mqttKeepAlive", 0, 600);
 
   if (mqttAddress && *mqttAddress && mqttPort) {