diff --git a/Grbl_Esp32/src/Machine/Axes.cpp b/Grbl_Esp32/src/Machine/Axes.cpp
index 753d4b04..659928e9 100644
--- a/Grbl_Esp32/src/Machine/Axes.cpp
+++ b/Grbl_Esp32/src/Machine/Axes.cpp
@@ -208,7 +208,8 @@ namespace Machine {
 
             if (handler.handlerType() == Configuration::HandlerType::Runtime || handler.handlerType() == Configuration::HandlerType::Parser ||
                 handler.handlerType() == Configuration::HandlerType::AfterParse ||
-                handler.handlerType() == Configuration::HandlerType::Generator) {
+                handler.handlerType() == Configuration::HandlerType::AfterParse ||
+                handler.handlerType() == Configuration::HandlerType::Validator) {
                 handler.section(tmp, _axis[a]);
             }
         }