diff --git a/src/hasp/hasp.cpp b/src/hasp/hasp.cpp
index 58e0bc94..5c2ce09a 100644
--- a/src/hasp/hasp.cpp
+++ b/src/hasp/hasp.cpp
@@ -158,7 +158,7 @@ void hasp_set_sleep_state(uint8_t state)
             break;
         case HASP_SLEEP_OFF:
             hasp_set_sleep_offset(0);
-            hasp_set_wakeup_touch(false);
+            // hasp_set_wakeup_touch(false);
             break;
         default:
             return;
diff --git a/src/hasp/hasp_dispatch.cpp b/src/hasp/hasp_dispatch.cpp
index ce0831c0..cee2ecb2 100644
--- a/src/hasp/hasp_dispatch.cpp
+++ b/src/hasp/hasp_dispatch.cpp
@@ -1337,21 +1337,6 @@ void dispatch_calibrate(const char*, const char*, uint8_t source)
     guiCalibrate();
 }
 
-void dispatch_wakeup()
-{
-    if(hasp_get_sleep_state() == HASP_SLEEP_OFF) return;
-    hasp_set_sleep_state(HASP_SLEEP_OFF);
-    dispatch_idle_state(HASP_SLEEP_OFF);
-}
-
-void dispatch_wakeup_obsolete(const char* topic, const char*, uint8_t source)
-{
-    LOG_WARNING(TAG_MSGR, F(D_ATTRIBUTE_OBSOLETE D_ATTRIBUTE_INSTEAD), topic,
-                "idle=off"); // TODO: obsolete wakeup
-    dispatch_wakeup();
-    hasp_set_wakeup_touch(false);
-}
-
 void dispatch_sleep(const char*, const char*, uint8_t source)
 {
     hasp_set_wakeup_touch(false);
@@ -1385,6 +1370,20 @@ void dispatch_idle(const char*, const char* payload, uint8_t source)
     dispatch_idle_state(hasp_get_sleep_state()); // always send the current state
 }
 
+void dispatch_wakeup(uint8_t source)
+{
+    //  if(hasp_get_sleep_state() == HASP_SLEEP_OFF) return;
+    dispatch_idle(NULL, "off", source);
+}
+
+void dispatch_wakeup_obsolete(const char* topic, const char*, uint8_t source)
+{
+    LOG_WARNING(TAG_MSGR, F(D_ATTRIBUTE_OBSOLETE D_ATTRIBUTE_INSTEAD), topic,
+                "idle=off"); // TODO: obsolete wakeup
+    dispatch_wakeup(source);
+    hasp_set_wakeup_touch(false);
+}
+
 void dispatch_reboot(const char*, const char*, uint8_t source)
 {
     dispatch_reboot(true);
diff --git a/src/hasp/hasp_dispatch.h b/src/hasp/hasp_dispatch.h
index 2e438a25..245da30c 100644
--- a/src/hasp/hasp_dispatch.h
+++ b/src/hasp/hasp_dispatch.h
@@ -78,7 +78,7 @@ void dispatch_send_sensordata(const char*, const char*, uint8_t source);
 void dispatch_idle_state(uint8_t state);
 void dispatch_calibrate(const char*, const char*, uint8_t source);
 void dispatch_antiburn(const char*, const char* payload, uint8_t source);
-void dispatch_wakeup();
+void dispatch_wakeup(uint8_t source);
 void dispatch_run_script(const char*, const char* payload, uint8_t source);
 void dispatch_config(const char* topic, const char* payload, uint8_t source);
 
diff --git a/src/hasp/hasp_event.cpp b/src/hasp/hasp_event.cpp
index 274640b9..62c579a6 100644
--- a/src/hasp/hasp_event.cpp
+++ b/src/hasp/hasp_event.cpp
@@ -377,12 +377,14 @@ void first_touch_event_handler(lv_obj_t* obj, lv_event_t event)
     if(event == LV_EVENT_RELEASED) {
         bool changed = hasp_stop_antiburn(); // Disable antiburn task
 
-        if(!haspDevice.get_backlight_power()) {
-            dispatch_backlight(NULL, "on", TAG_EVENT); // backlight on and also disable wakeup touch
-            hasp_set_wakeup_touch(false);              // only disable wakeup touch
-        } else {
-            hasp_set_wakeup_touch(false); // only disable wakeup touch
-        }
+        /*  if(!haspDevice.get_backlight_power()) { */
+
+        dispatch_backlight(NULL, "on", TAG_EVENT); // backlight on and also disable wakeup touch
+        hasp_set_wakeup_touch(false);              // only disable wakeup touch
+
+        /*  } else {
+              hasp_set_wakeup_touch(false); // only disable wakeup touch
+          }*/
 
         hasp_update_sleep_state();                                // wakeup, send Idle off
         if(changed) dispatch_state_antiburn(hasp_get_antiburn()); // publish the new state
diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp
index c14f8ca2..46d9aec2 100644
--- a/src/sys/svc/hasp_http.cpp
+++ b/src/sys/svc/hasp_http.cpp
@@ -1274,15 +1274,15 @@ static void handleFileCreate()
         }
     }
     if(webServer.hasArg(F("init"))) {
-        dispatch_wakeup();
+        dispatch_wakeup(TAG_HTTP);
         hasp_init();
     }
     if(webServer.hasArg(F("load"))) {
-        dispatch_wakeup();
+        dispatch_wakeup(TAG_HTTP);
         hasp_load_json();
     }
     if(webServer.hasArg(F("page"))) {
-        dispatch_wakeup();
+        dispatch_wakeup(TAG_HTTP);
         dispatch_page(NULL, webServer.arg(F("page")).c_str(), TAG_HTTP);
         // uint8_t pageid = atoi(webServer.arg(F("page")).c_str());
         // dispatch_set_page(pageid, LV_SCR_LOAD_ANIM_NONE);