diff --git a/config/mqtt.json b/config/mqtt.json
index c6d29be..ded9488 100644
--- a/config/mqtt.json
+++ b/config/mqtt.json
@@ -5,6 +5,7 @@
     "devicename": "voltronic",
     "username": "",
     "password": "",
+	"clientid": "voltronic_bd8041d0cdf131a6ba4e5b3360b8bc5a",
     "influx": {
         "enabled": "false",
         "host": "http://[INFLUX_IP_OR_URL]:8086", 
diff --git a/sources/inverter-mqtt/mqtt-init.sh b/sources/inverter-mqtt/mqtt-init.sh
index bd823d3..a08fbb9 100755
--- a/sources/inverter-mqtt/mqtt-init.sh
+++ b/sources/inverter-mqtt/mqtt-init.sh
@@ -8,6 +8,7 @@ MQTT_TOPIC=`cat /etc/inverter/mqtt.json | jq '.topic' -r`
 MQTT_DEVICENAME=`cat /etc/inverter/mqtt.json | jq '.devicename' -r`
 MQTT_USERNAME=`cat /etc/inverter/mqtt.json | jq '.username' -r`
 MQTT_PASSWORD=`cat /etc/inverter/mqtt.json | jq '.password' -r`
+MQTT_CLIENTID=`cat /etc/inverter/mqtt.json | jq '.clientid' -r`
 
 registerTopic () {
     mosquitto_pub \
@@ -15,7 +16,7 @@ registerTopic () {
         -p $MQTT_PORT \
         -u "$MQTT_USERNAME" \
         -P "$MQTT_PASSWORD" \
-        -i "voltronic_8a39d0c8faf1" \
+        -i $MQTT_CLIENTID \
         -t "$MQTT_TOPIC/sensor/"$MQTT_DEVICENAME"_$1/config" \
         -m "{
             \"name\": \""$MQTT_DEVICENAME"_$1\",
@@ -31,7 +32,7 @@ registerInverterRawCMD () {
         -p $MQTT_PORT \
         -u "$MQTT_USERNAME" \
         -P "$MQTT_PASSWORD" \
-        -i "voltronic_8a39d0c8faf1" \
+        -i $MQTT_CLIENTID \
         -t "$MQTT_TOPIC/sensor/$MQTT_DEVICENAME/config" \
         -m "{
             \"name\": \""$MQTT_DEVICENAME"\",
diff --git a/sources/inverter-mqtt/mqtt-push.sh b/sources/inverter-mqtt/mqtt-push.sh
index cf8a044..e931de0 100755
--- a/sources/inverter-mqtt/mqtt-push.sh
+++ b/sources/inverter-mqtt/mqtt-push.sh
@@ -8,13 +8,14 @@ pushMQTTData () {
     MQTT_DEVICENAME=`cat /etc/inverter/mqtt.json | jq '.devicename' -r`
     MQTT_USERNAME=`cat /etc/inverter/mqtt.json | jq '.username' -r`
     MQTT_PASSWORD=`cat /etc/inverter/mqtt.json | jq '.password' -r`
+	MQTT_CLIENTID=`cat /etc/inverter/mqtt.json | jq '.clientid' -r`
 
     mosquitto_pub \
         -h $MQTT_SERVER \
         -p $MQTT_PORT \
         -u "$MQTT_USERNAME" \
         -P "$MQTT_PASSWORD" \
-        -i "voltronic_8a39d0c8faf1" \
+        -i $MQTT_CLIENTID \
         -t "$MQTT_TOPIC/sensor/"$MQTT_DEVICENAME"_$1" \
         -m "$2"
     
diff --git a/sources/inverter-mqtt/mqtt-subscriber.sh b/sources/inverter-mqtt/mqtt-subscriber.sh
index 982b282..4901edb 100755
--- a/sources/inverter-mqtt/mqtt-subscriber.sh
+++ b/sources/inverter-mqtt/mqtt-subscriber.sh
@@ -6,6 +6,7 @@ MQTT_TOPIC=`cat /etc/inverter/mqtt.json | jq '.topic' -r`
 MQTT_DEVICENAME=`cat /etc/inverter/mqtt.json | jq '.devicename' -r`
 MQTT_USERNAME=`cat /etc/inverter/mqtt.json | jq '.username' -r`
 MQTT_PASSWORD=`cat /etc/inverter/mqtt.json | jq '.password' -r`
+MQTT_CLIENTID=`cat /etc/inverter/mqtt.json | jq '.clientid' -r`
 
 while read rawcmd;
 do
@@ -13,4 +14,4 @@ do
     echo "Incoming request send: [$rawcmd] to inverter."
     /opt/inverter-cli/bin/inverter_poller -r $rawcmd;
 
-done < <(mosquitto_sub -h $MQTT_SERVER -p $MQTT_PORT -u "$MQTT_USERNAME" -P "$MQTT_PASSWORD" -i "voltronic_8a39d0c8faf1" -t "$MQTT_TOPIC/sensor/$MQTT_DEVICENAME" -q 1)
+done < <(mosquitto_sub -h $MQTT_SERVER -p $MQTT_PORT -u "$MQTT_USERNAME" -P "$MQTT_PASSWORD" -i $MQTT_CLIENTID -t "$MQTT_TOPIC/sensor/$MQTT_DEVICENAME" -q 1)