diff --git a/src/HAMqtt.cpp b/src/HAMqtt.cpp
index 526a8dc..ed1c15c 100644
--- a/src/HAMqtt.cpp
+++ b/src/HAMqtt.cpp
@@ -312,7 +312,9 @@ void HAMqtt::connectToServer()
         true
     );
 
-    if (!isConnected()) {
+    if (isConnected()) {
+        setState(StateConnected);
+    } else {
         ARDUINOHA_DEBUG_PRINTLN(F("AHA: failed to connect"))
     }
 }
diff --git a/src/mocks/PubSubClientMock.cpp b/src/mocks/PubSubClientMock.cpp
index 6140871..4562eea 100644
--- a/src/mocks/PubSubClientMock.cpp
+++ b/src/mocks/PubSubClientMock.cpp
@@ -8,7 +8,7 @@ PubSubClientMock::PubSubClientMock() :
     _flushedMessages(nullptr),
     _keepAlive(15),
     _bufferSize(256),
-    _state(0),
+    _state(-1),
     _flushedMessagesNb(0),
     _subscriptions(nullptr),
     _subscriptionsNb(0),