diff --git a/grbl/system.c b/grbl/system.c
index 55e6c406..c35a717e 100644
--- a/grbl/system.c
+++ b/grbl/system.c
@@ -179,12 +179,13 @@ uint8_t system_execute_line(char *line)
         case 'H' : // Perform homing cycle [IDLE/ALARM]
           if (bit_isfalse(settings.flags,BITFLAG_HOMING_ENABLE)) {return(STATUS_SETTING_DISABLED); }
           if (system_check_safety_door_ajar()) { return(STATUS_CHECK_DOOR); } // Block if safety door is ajar.
-          sys.state = STATE_HOMING; // Set system state variable
           if (line[2] == 0) {
+            sys.state = STATE_HOMING; // Set system state variable
             mc_homing_cycle(HOMING_CYCLE_ALL);
           #ifdef HOMING_SINGLE_AXIS_COMMANDS
             } else if (line[3] == 0) {
               switch (line[2]) {
+                sys.state = STATE_HOMING; // Set system state variable
                 case 'X': mc_homing_cycle(HOMING_CYCLE_X); break;
                 case 'Y': mc_homing_cycle(HOMING_CYCLE_Y); break;
                 case 'Z': mc_homing_cycle(HOMING_CYCLE_Z); break;