diff --git a/Grbl_Esp32/src/MotionControl.cpp b/Grbl_Esp32/src/MotionControl.cpp
index c4f64222..c9a943cd 100644
--- a/Grbl_Esp32/src/MotionControl.cpp
+++ b/Grbl_Esp32/src/MotionControl.cpp
@@ -399,6 +399,8 @@ void mc_homing_cycle(AxisMask axis_mask) {
         }
         if (!someAxisHomed) {
             report_status_message(Error::HomingNoCycles, CLIENT_ALL);
+            sys.state = State::ConfigAlarm;
+            return;
         }
     }
     protocol_execute_realtime();  // Check for reset and set system abort.