diff --git a/code/espurna/ntp.ino b/code/espurna/ntp.ino
index 0772ef20..99cbdbaa 100644
--- a/code/espurna/ntp.ino
+++ b/code/espurna/ntp.ino
@@ -14,7 +14,7 @@ Copyright (C) 2016-2017 by Xose Pérez <xose dot perez at gmail dot com>
 // NTP
 // -----------------------------------------------------------------------------
 
-void ntpConnect(WiFiEventStationModeGotIP ipInfo) {
+void ntpConnect() {
     NTP.begin(NTP_SERVER, NTP_TIME_OFFSET, NTP_DAY_LIGHT);
     NTP.setInterval(NTP_UPDATE_INTERVAL);
 }
@@ -33,9 +33,6 @@ void ntpSetup() {
         }
     });
 
-    static WiFiEventHandler e;
-    e = WiFi.onStationModeGotIP(ntpConnect);
-
 }
 
 void ntpLoop() {
diff --git a/code/espurna/wifi.ino b/code/espurna/wifi.ino
index 70335e32..8826c256 100644
--- a/code/espurna/wifi.ino
+++ b/code/espurna/wifi.ino
@@ -168,6 +168,11 @@ void wifiSetup() {
             dnsServer.stop();
         }
 
+        // NTP connection reset
+        if (code == MESSAGE_CONNECTED) {
+            ntpConnect();
+        }
+
         // Manage POW
         #if ENABLE_POW
             if (code == MESSAGE_CONNECTED) {