diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 6d7498c28b..95a7bd572a 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -15,8 +15,8 @@
 //#define MachineCR20Pro
 //#define MachineCR10
 //#define MachineCR10S
-#define MachineCR10SPro // Graphics LCD Requires soldering R64 and R66
-//#define MachineCRX
+//#define MachineCR10SPro // Graphics LCD Requires soldering R64 and R66
+#define MachineCRX
 //#define MachineCR10Max
 //#define MachineS4
 //#define MachineS5
@@ -102,7 +102,7 @@
 */
 //#define ABL_EZABL // TH3D EZABL or Any NO Sensor
 //#define ABL_NCSW //Creality ABL or Any NC Sensor
-//#define ABL_BLTOUCH
+#define ABL_BLTOUCH
 
 //#define CREALITY_ABL_MOUNT //Using creality ABL mount
 //#define E3D_DUALFAN_MOUNT // Using HD Modular mount as above with 2 5015 blowers and sensor on the right
@@ -114,7 +114,7 @@
    Melzi board users may only select ABL_BI for bilinear leveling
 */
 //#define ABL_BI
-//#define ABL_UBL
+#define ABL_UBL
 
 //#define POWER_LOSS_RECOVERY //Large and does not fit with any other features on Melzi, or UBL on Atmega
 /*
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 264dd16700..3114011def 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -854,7 +854,8 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
 
     #if HAS_LEVELING
       // Set current position to the physical position
-      TEMPORARY_BED_LEVELING_STATE(false);
+      const bool leveling_was_enabled = planner.leveling_active;
+      set_bed_leveling_enabled(false);
     #endif
 
     if (new_tool != old_tool) {
@@ -1035,6 +1036,9 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
     } // (new_tool != old_tool)
 
     planner.synchronize();
+    #if HAS_LEVELING
+      set_bed_leveling_enabled(leveling_was_enabled);
+    #endif
 
     #if ENABLED(EXT_SOLENOID) && DISABLED(PARKING_EXTRUDER)
       disable_all_solenoids();