diff --git a/Network.cpp b/Network.cpp
index 2114d03..9a28484 100644
--- a/Network.cpp
+++ b/Network.cpp
@@ -183,7 +183,7 @@ void Network::update()
 
     if(!_device->isConnected())
     {
-        if(ts - _lastConnectedTs > _networkTimeout * 1000)
+        if(_networkTimeout > 0 && (ts - _lastConnectedTs > _networkTimeout * 1000))
         {
             Serial.println("Network timeout has been reached, restarting ...");
             delay(200);
diff --git a/webflash/nuki_hub.bin b/webflash/nuki_hub.bin
index acb565a..31866b2 100644
Binary files a/webflash/nuki_hub.bin and b/webflash/nuki_hub.bin differ