diff --git a/lib/IotWebConf2/src/IotWebConf2.cpp b/lib/IotWebConf2/src/IotWebConf2.cpp
index 8b5bb662..48ac8ac3 100644
--- a/lib/IotWebConf2/src/IotWebConf2.cpp
+++ b/lib/IotWebConf2/src/IotWebConf2.cpp
@@ -906,7 +906,11 @@ void IotWebConf2::stateChanged(byte oldState, byte newState)
         IOTWEBCONF_DEBUG_LINE(F("Releasing forced AP mode."));
         this->_forceDefaultPassword = false;
       }
-
+      if (oldState == IOTWEBCONF_STATE_BOOT && this->_updateServer != NULL)
+      {
+        // We skiped AP mode so update server was never setup yet
+        this->_updateServer->setup(this->_server, this->_updatePath);
+      }
       this->blinkInternal(1000, 50);
 #ifdef IOTWEBCONF_DEBUG_TO_SERIAL
       Serial.print("Connecting to [");