diff --git a/include/ir.h b/include/ir.h
index ba6809e..81bbcc9 100644
--- a/include/ir.h
+++ b/include/ir.h
@@ -49,7 +49,7 @@ namespace Ir {
             {
             case 0x9F:
                 avrOn = false;
-                tCheckWifi.enableDelayed(5*TASK_SECOND);
+                tCheckWifi.enableDelayed();
                 Display::displayText("Off");
                 break;
             case 0x12:
diff --git a/src/esp_clock.cpp b/src/esp_clock.cpp
index 9d4298f..2d434cc 100644
--- a/src/esp_clock.cpp
+++ b/src/esp_clock.cpp
@@ -6,7 +6,7 @@ void onWifiConnected();
 // #define _TASK_STATUS_REQUEST
 #include <TaskScheduler.h>
 Scheduler ts;
-Task tCheckWifi(5000, TASK_FOREVER, checkWifiCallback, &ts);
+Task tCheckWifi(5*TASK_SECOND, TASK_FOREVER, checkWifiCallback, &ts);
 Task tWifiConnected(TASK_IMMEDIATE, TASK_ONCE, onWifiConnected, &ts);
 
 #include "wifi.h"
@@ -17,7 +17,7 @@ Task tWifiConnected(TASK_IMMEDIATE, TASK_ONCE, onWifiConnected, &ts);
 #include "ota.h"
 #include "ir.h"
 
-#define STAY_CONNECTED_AFTER_BOOT 15
+#define STAY_CONNECTED_AFTER_BOOT 5*60
 
 void setup() {
 
@@ -41,7 +41,7 @@ void onWifiConnected() {
   Serial.println("Wifi connected event");
   Wifi::printStatus();
   Ota::tLoop.enable();
-  if (!Ir::avrOn) tCheckWifi.enable();
+  if (!Ir::avrOn) tCheckWifi.enableDelayed();
   Mqtt::client.connect();
   if (time_t newTime = Ntp::updateTime()) {
     Serial.println(asctime(localtime(&newTime)));