diff --git a/src/hasp/hasp.cpp b/src/hasp/hasp.cpp
index dbae6d46..0cc018be 100644
--- a/src/hasp/hasp.cpp
+++ b/src/hasp/hasp.cpp
@@ -319,7 +319,6 @@ static void custom_font_apply_cb(lv_theme_t* th, lv_obj_t* obj, lv_theme_style_t
  */
 void haspSetup(void)
 {
-    dispatchSetup();
     haspDevice.set_backlight_level(haspStartDim);
 
     /******* File System Test ********************************************************************/
diff --git a/src/main_arduino.cpp b/src/main_arduino.cpp
index 8dfec4c7..c9c792a8 100644
--- a/src/main_arduino.cpp
+++ b/src/main_arduino.cpp
@@ -58,7 +58,8 @@ void setup()
 #endif
 
     guiSetup();
-    debugSetup(); // Init the console
+    debugSetup();    // Init the console
+    dispatchSetup(); // for hasp and oobe
 
 #if HASP_USE_CONFIG > 0
     if(!oobeSetup())
diff --git a/src/main_windows.cpp b/src/main_windows.cpp
index 2efb6f21..00a4272c 100644
--- a/src/main_windows.cpp
+++ b/src/main_windows.cpp
@@ -110,6 +110,7 @@ void setup()
     //    debugSetup(); // Init the console
 
     printf("%s %d\n", __FILE__, __LINE__);
+    dispatchSetup(); // for hasp and oobe
     haspSetup();
 
 #if HASP_USE_MQTT > 0