diff --git a/src/ebusd/mqtthandler.cpp b/src/ebusd/mqtthandler.cpp
index 3a4df061..9b686091 100755
--- a/src/ebusd/mqtthandler.cpp
+++ b/src/ebusd/mqtthandler.cpp
@@ -620,11 +620,12 @@ void MqttHandler::handleTraffic(bool allowReconnect) {
 #else
         ret = mosquitto_connect(m_mosquitto, g_host, g_port, 60, true);
 #endif
-        if (ret != MOSQ_ERR_SUCCESS) {
+        if (ret == MOSQ_ERR_INVAL) {
           logOtherError("mqtt", "unable to connect (invalid parameters), retrying");
-          return;
         }
-        m_initialConnectFailed = false;
+        if (ret == MOSQ_ERR_SUCCESS) {
+          m_initialConnectFailed = false;
+        }
       } else {
         ret = mosquitto_reconnect(m_mosquitto);
       }