diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp
index 450c8441d..674f13e61 100644
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -74,11 +74,9 @@ void MQTT::reconnect()
         String port = server.substring(delimIndex+1, server.length());
         server[delimIndex] = 0;
         serverPort = port.toInt();
-        pubSub.setServer(server.c_str(), serverPort);
-    }
-    else {
-        pubSub.setServer(serverAddr, serverPort);
+        serverAddr = server.c_str();
     }
+    pubSub.setServer(serverAddr, serverPort);
 
     DEBUG_MSG("Connecting to MQTT server %s, port: %d\n", server.c_str(), serverPort);
     auto myStatus = (statusTopic + owner.id);