diff --git a/src/hasp_dispatch.cpp b/src/hasp_dispatch.cpp
index c3ab0fa7..d051aa40 100644
--- a/src/hasp_dispatch.cpp
+++ b/src/hasp_dispatch.cpp
@@ -114,6 +114,9 @@ void dispatchAttribute(String strTopic, const char * payload)
     } else if(strTopic == F("light")) {
         dispatchBacklight(payload);
 
+    } else if(cmnd == F("reboot") || cmnd == F("restart")) {
+        dispatchReboot(true);
+
     } else if(strTopic == F("clearpage")) {
         dispatchClearPage(payload);
 
@@ -196,8 +199,6 @@ void dispatchCommand(String cmnd)
         haspWakeUp();
     } else if(cmnd == F("screenshot")) {
         // guiTakeScreenshot("/screenhot.bmp");
-    } else if(cmnd == F("reboot") || cmnd == F("restart")) {
-        dispatchReboot(true);
     } else if(cmnd == F("") || cmnd == F("statusupdate")) {
         dispatchStatusUpdate();
     } else {