diff --git a/printer_data/config/CUSTOM/c_knomi.cfg b/printer_data/config/CUSTOM/c_knomi.cfg
index 3849b01..843d0e7 100644
--- a/printer_data/config/CUSTOM/c_knomi.cfg
+++ b/printer_data/config/CUSTOM/c_knomi.cfg
@@ -20,12 +20,13 @@ gcode:
   M190.1 {rawparams}
   SET_GCODE_VARIABLE MACRO=_KNOMI_STATUS VARIABLE=heating_bed VALUE=False
 
-[gcode_macro G28]
-rename_existing: G28.1
-gcode:
-  SET_GCODE_VARIABLE MACRO=_KNOMI_STATUS VARIABLE=homing VALUE=True
-  G28.1 {rawparams}
-  SET_GCODE_VARIABLE MACRO=_KNOMI_STATUS VARIABLE=homing VALUE=False
+#  ~ Inserted into s_homing ~
+#[gcode_macro G28]
+#rename_existing: G28.1
+#gcode:
+#  SET_GCODE_VARIABLE MACRO=_KNOMI_STATUS VARIABLE=homing VALUE=True
+#  G28.1 {rawparams}
+#  SET_GCODE_VARIABLE MACRO=_KNOMI_STATUS VARIABLE=homing VALUE=False
 
 [gcode_macro BED_MESH_CALIBRATE]
 rename_existing: BTT_BED_MESH_CALIBRATE
diff --git a/printer_data/config/CUSTOM/s_homing.cfg b/printer_data/config/CUSTOM/s_homing.cfg
index 275db99..9db64e8 100644
--- a/printer_data/config/CUSTOM/s_homing.cfg
+++ b/printer_data/config/CUSTOM/s_homing.cfg
@@ -63,6 +63,7 @@ gcode:
 [homing_override]
 axes: xyz
 gcode:
+  SET_GCODE_VARIABLE MACRO=_KNOMI_STATUS VARIABLE=homing VALUE=True
   {% set home_all = 'X' not in params and 'Y' not in params and 'Z' not in params %}
 
   SET_KINEMATIC_POSITION Z=0
@@ -85,6 +86,7 @@ gcode:
 
     G1 Z10 F1500
   {% endif %}
+  SET_GCODE_VARIABLE MACRO=_KNOMI_STATUS VARIABLE=homing VALUE=False
 
 
 [gcode_macro _CG28]