diff --git a/include/ir.h b/include/ir.h
index 1a14334..df8ea5e 100644
--- a/include/ir.h
+++ b/include/ir.h
@@ -12,6 +12,9 @@
 
 namespace Ir {
 
+    void loop();
+    Task tLoop(TASK_IMMEDIATE, TASK_FOREVER, loop, &ts, true);
+
     IRrecv irrecv(IR_INPUT_PIN);
     decode_results results;
     bool avrOn = false;
@@ -40,10 +43,6 @@ namespace Ir {
         Display::adjustTime();
     }
 
-    void setup() {
-        irrecv.enableIRIn();  // Start the receiver
-    }
-
     void loop() {
         if (readCommand()) {
             Display::tDisplay.setCallback(displayValue);
@@ -72,6 +71,10 @@ namespace Ir {
             Mqtt::commands.pop();
         }
     }
+
+    void setup() {
+        irrecv.enableIRIn();  // Start the receiver
+    }
 }
 
 #else
diff --git a/include/ota.h b/include/ota.h
index 69b736f..b834a8a 100644
--- a/include/ota.h
+++ b/include/ota.h
@@ -1,7 +1,9 @@
 #include <ArduinoOTA.h>
 
-namespace  Ota
-{
+namespace  Ota {
+
+	void loop();
+	Task tLoop(TASK_IMMEDIATE, TASK_FOREVER, loop, &ts, true);
 
 	void setup() {
 		ArduinoOTA.onStart([]() {
@@ -25,6 +27,6 @@ namespace  Ota
 	}
 
 	void loop() {
-	    ArduinoOTA.handle();
+		ArduinoOTA.handle();
 	}
 }
diff --git a/src/esp_clock.cpp b/src/esp_clock.cpp
index e7864f2..085f3d9 100644
--- a/src/esp_clock.cpp
+++ b/src/esp_clock.cpp
@@ -17,9 +17,9 @@ StatusRequest wifiConnected;
 #define STAY_CONNECTED_AFTER_BOOT 5*60
 
 void wifiConnectedCallback();
-void otaCallback();
+void checkWifiCallback();
 
-Task tOta(TASK_IMMEDIATE, TASK_FOREVER, otaCallback, &ts);
+Task tCheckWifi(5000, TASK_FOREVER, checkWifiCallback, &ts);
 Task tWifiReconnect(Wifi::reconnect, &ts);
 Task tWifiConnected(wifiConnectedCallback, &ts);
 
@@ -42,8 +42,6 @@ void setup() {
 }
 
 void loop() {
-  Ir::loop();
-
   ts.execute();
 }
 
@@ -53,14 +51,15 @@ void wifiConnectedCallback() {
     Serial.println(asctime(localtime(&newTime)));
     Ntp::lastConnectedTime = newTime;
   }
-  tOta.enable();
+  Ota::tLoop.enable();
+  tCheckWifi.enable();
   Mqtt::client.connect();
 }
 
-void otaCallback() {
-  Ota::loop();
+void checkWifiCallback() {
   if ((difftime(now(), Ntp::lastConnectedTime) > STAY_CONNECTED_AFTER_BOOT) && !Ir::avrOn) {
     Wifi::disconnect();
-    tOta.disable();
+    Ota::tLoop.disable();
+    tCheckWifi.disable();
   }
 }