diff --git a/main/debuginputhandler.cpp b/main/debuginputhandler.cpp
index 6a54445..16ca8bc 100644
--- a/main/debuginputhandler.cpp
+++ b/main/debuginputhandler.cpp
@@ -21,6 +21,7 @@ void initDebugInput()
 {
     Serial.begin(115200);
     //Serial.setDebugOutput(true);
+    pinMode(3, INPUT_PULLUP);
 }
 
 void handleDebugInput()
diff --git a/main/main.cpp b/main/main.cpp
index e62c37f..25d8f42 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -41,9 +41,6 @@ using namespace std::chrono_literals;
 #endif
 #include "drivingstatistics.h"
 #include "newsettings.h"
-#ifdef FEATURE_ESPNOW
-#include "espnowfunctions.h"
-#endif
 #include "taskmanager.h"
 
 namespace {
@@ -64,10 +61,6 @@ extern "C" void app_main()
     digitalWrite(PINS_LEDBACKLIGHT, ledBacklightInverted ? LOW : HIGH);
 #endif
 
-    pinMode(3, INPUT_PULLUP);
-
-    currentlyReverseBeeping = false;
-
     initScreen();
 
     bootLabel.redraw("settings");
@@ -103,9 +96,6 @@ extern "C" void app_main()
         task.setup();
     }
 
-    for (Controller &controller : controllers)
-        controller.command.buzzer = {};
-
     currentMode = &modes::defaultMode;
 
 #ifdef FEATURE_CLOUD
@@ -137,9 +127,6 @@ extern "C" void app_main()
         }
     }
 #endif
-#ifdef FEATURE_ESPNOW
-    espnow::initESPNow();
-#endif
 
     while (true)
     {
@@ -197,10 +184,6 @@ extern "C" void app_main()
             performance.lastTime = now;
         }
 
-#ifdef FEATURE_ESPNOW
-        espnow::handle();
-#endif
-
 #ifdef FEATURE_CLOUD
         if (!lastCloudCollect || now - *lastCloudCollect >= std::chrono::milliseconds{settings.boardcomputerHardware.timersSettings.cloudCollectRate})
         {
diff --git a/main/taskmanager.cpp b/main/taskmanager.cpp
index a70f90f..5b80af6 100644
--- a/main/taskmanager.cpp
+++ b/main/taskmanager.cpp
@@ -60,6 +60,9 @@
 #ifdef FEATURE_LEDSTRIP
 #include "ledstrip.h"
 #endif
+#ifdef FEATURE_ESPNOW
+#include "espnowfunctions.h"
+#endif
 
 using namespace std::chrono_literals;
 
@@ -117,6 +120,8 @@ espcpputils::SchedulerTask schedulerTasksArr[] {
 #ifdef FEATURE_LEDSTRIP
     espcpputils::SchedulerTask { "ledstrip",       initLedStrip,          updateLedStrip,          30ms },
 #endif
+#ifdef FEATURE_ESPNOW
+    espcpputils::SchedulerTask { "espnow",         espnow::initESPNow,    espnow::handle,          100ms },
 };
 } // namespace
 
diff --git a/main/utils.cpp b/main/utils.cpp
index 2a71798..cfa0147 100644
--- a/main/utils.cpp
+++ b/main/utils.cpp
@@ -5,7 +5,7 @@
 
 using namespace std::chrono_literals;
 
-bool currentlyReverseBeeping;
+bool currentlyReverseBeeping{};
 bool reverseBeepToggle;
 espchrono::millis_clock::time_point lastReverseBeepToggle;