diff --git a/lib/mqtt.js b/lib/mqtt.js
index 93a30bbc..9f7450a8 100644
--- a/lib/mqtt.js
+++ b/lib/mqtt.js
@@ -18,6 +18,11 @@ class MQTT {
             options.password = mqttSettings.password;
         }
 
+        if (mqttSettings.client_id) {
+            logger.debug(`Using MQTT client ID: '${mqttSettings.client_id}'`);
+            options.clientId = mqttSettings.client_id;
+        }
+
         this.client = mqtt.connect(mqttSettings.server, options);
 
         // Register callbacks.