diff --git a/Grbl_Esp32/src/Grbl.cpp b/Grbl_Esp32/src/Grbl.cpp
index 1cdb74b7..f0f81e05 100644
--- a/Grbl_Esp32/src/Grbl.cpp
+++ b/Grbl_Esp32/src/Grbl.cpp
@@ -24,6 +24,8 @@
 #include <WiFi.h>
 #include <SPIFFS.h>
 
+extern void make_grbl_commands();
+
 void grbl_init() {
     try {
         client_init();  // Setup serial baud rate and interrupts
@@ -50,8 +52,9 @@ void grbl_init() {
 
         // Load Grbl settings from non-volatile storage
         debug_serial("Initializing settings...");
-        settings_init();
+        settings_init(); // requires config
         config->load(config_filename->get());
+        make_grbl_commands();
 
         info_serial("Name: %s", config->_name.c_str());
         info_serial("Board: %s", config->_board.c_str());
diff --git a/Grbl_Esp32/src/MachineConfig.h b/Grbl_Esp32/src/MachineConfig.h
index 949222c3..03000644 100644
--- a/Grbl_Esp32/src/MachineConfig.h
+++ b/Grbl_Esp32/src/MachineConfig.h
@@ -364,6 +364,11 @@ public:
     bool    _homingInitLock    = false;
     int     _stepType          = ST_RMT;
 
+    
+    // Enables a special set of M-code commands that enables and disables the parking motion.
+    // These are controlled by `M56`, `M56 P1`, or `M56 Px` to enable and `M56 P0` to disable.
+    // The command is modal and will be set after a planner sync. Since it is GCode, it is
+    // executed in sync with GCode commands. It is not a real-time command.
     bool _enableParkingOverrideControl = false;
     bool _deactivateParkingUponInit    = false;
     bool _homingSingleAxisCommands     = false;
diff --git a/Grbl_Esp32/src/ProcessSettings.cpp b/Grbl_Esp32/src/ProcessSettings.cpp
index 55595386..bb8c19e9 100644
--- a/Grbl_Esp32/src/ProcessSettings.cpp
+++ b/Grbl_Esp32/src/ProcessSettings.cpp
@@ -84,7 +84,6 @@ namespace WebUI {
 void settings_init() {
     make_settings();
     WebUI::make_web_settings();
-    make_grbl_commands();
     load_settings();
 }