diff --git a/Marlin/Conditionals_post.h b/Marlin/Conditionals_post.h
index d37a9eb2e..c246dbc07 100644
--- a/Marlin/Conditionals_post.h
+++ b/Marlin/Conditionals_post.h
@@ -848,11 +848,6 @@
         #define XY_PROBE_SPEED 4000
       #endif
     #endif
-    #if Z_CLEARANCE_BETWEEN_PROBES > Z_CLEARANCE_DEPLOY_PROBE
-      #define _Z_CLEARANCE_DEPLOY_PROBE Z_CLEARANCE_BETWEEN_PROBES
-    #else
-      #define _Z_CLEARANCE_DEPLOY_PROBE Z_CLEARANCE_DEPLOY_PROBE
-    #endif
   #else
     #undef X_PROBE_OFFSET_FROM_EXTRUDER
     #undef Y_PROBE_OFFSET_FROM_EXTRUDER
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 2792079aa..4d3897364 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -2107,15 +2107,15 @@ static void clean_up_after_endstop_or_probe_move() {
 
     if (endstops.z_probe_enabled == deploy) return false;
 
-    // Fix-mounted probe should only raise for deploy
-    #if ENABLED(FIX_MOUNTED_PROBE)
-      #define RAISE_COND deploy
-    #else
-      #define RAISE_COND true
-    #endif
-
     // Make room for probe to deploy (or stow)
-    if (RAISE_COND) do_probe_raise(_Z_CLEARANCE_DEPLOY_PROBE);
+    // Fix-mounted probe should only raise for deploy
+    if (
+      #if ENABLED(FIX_MOUNTED_PROBE)
+        deploy
+      #else
+        true
+      #endif
+    ) do_probe_raise(max(Z_CLEARANCE_BETWEEN_PROBES, Z_CLEARANCE_DEPLOY_PROBE));
 
     #if ENABLED(Z_PROBE_SLED) || ENABLED(Z_PROBE_ALLEN_KEY)
       #if ENABLED(Z_PROBE_SLED)