diff --git a/ESPGeiger/src/Mqtt/MQTT_Client.cpp b/ESPGeiger/src/Mqtt/MQTT_Client.cpp
index b55e37c..c75e6cc 100644
--- a/ESPGeiger/src/Mqtt/MQTT_Client.cpp
+++ b/ESPGeiger/src/Mqtt/MQTT_Client.cpp
@@ -113,7 +113,7 @@ void MQTT_Client::reconnect()
   digitalWrite(LED_SEND_RECEIVE, LED_SEND_RECEIVE_ON);
 
   Log::console(PSTR("MQTT: Attempting connection ... %s:%s"), configManager.getParamValueFromID("mqttServer"), configManager.getParamValueFromID("mqttPort"));
-  if (connect(clientId, configManager.getParamValueFromID("mqttUser"), configManager.getParamValueFromID("mqttPassword"), buildTopic(teleTopic, topicLWT).c_str(), 2, false, lwtOffline ))
+  if (connect(configManager.getHostName(), configManager.getParamValueFromID("mqttUser"), configManager.getParamValueFromID("mqttPassword"), buildTopic(teleTopic, topicLWT).c_str(), 2, false, lwtOffline ))
   {
     yield();
     Log::console(PSTR("MQTT: Connected!"));
@@ -133,7 +133,7 @@ String MQTT_Client::buildTopic(const char *baseTopic, const char *cmnd)
 {
   ConfigManager &configManager = ConfigManager::getInstance();
   String topic = baseTopic;
-  topic.replace("%st%", clientId);
+  topic.replace("%st%", configManager.getHostName());
   topic.replace("%cm%", cmnd);
 
   return topic;
@@ -153,7 +153,5 @@ void MQTT_Client::begin()
   setServer(configManager.getParamValueFromID("mqttServer"), atoi(configManager.getParamValueFromID("mqttPort")));
 
   mqttEnabled = true;
-  const char* hostName = configManager.getHostName();
-  strcat(clientId, hostName);
 
 }
\ No newline at end of file
diff --git a/ESPGeiger/src/Mqtt/MQTT_Client.h b/ESPGeiger/src/Mqtt/MQTT_Client.h
index dfc9145..9e2d45d 100644
--- a/ESPGeiger/src/Mqtt/MQTT_Client.h
+++ b/ESPGeiger/src/Mqtt/MQTT_Client.h
@@ -54,7 +54,6 @@ class MQTT_Client : public PubSubClient {
   unsigned long lastConnectionAtempt = 0;
   uint8_t connectionAtempts = 0;
   bool mqttEnabled = true;
-  char clientId[16] = "";
 
   const unsigned long pingInterval = 1 * 60 * 1000;
   const unsigned long reconnectionInterval = 5 * 1000;