diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index ebf35e6bd..4ecd17f35 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -2821,12 +2821,14 @@ static void gcode_G80()
 #endif //PINDA_THERMISTOR
 
     uint8_t nMeasPoints = eeprom_read_byte((uint8_t*)EEPROM_MBL_POINTS_NR);
-    if (code_seen('N') && (code_value_uint8() == 7 || code_value_uint8() == 3))
-      nMeasPoints = code_value_uint8();
-    
+    bool bCodeSeen = code_seen('N');
+    if (uint8_t value = code_value_uint8(); bCodeSeen && (value == 7 || value == 3))
+      nMeasPoints = value;
+
     uint8_t nProbeRetryCount = eeprom_read_byte((uint8_t*)EEPROM_MBL_PROBE_NR);
-    if (code_seen('C') && code_value_uint8() >= 1 && code_value_uint8() <= 10)
-      nProbeRetryCount = code_value_uint8();
+    bCodeSeen = code_seen('C');
+    if (uint8_t value = code_value_uint8(); bCodeSeen && value >= 1 && value <= 10)
+      nProbeRetryCount = value;
 
     const float area_min_x = code_seen('X') ? code_value() - x_mesh_density - X_PROBE_OFFSET_FROM_EXTRUDER : -INFINITY;
     const float area_min_y = code_seen('Y') ? code_value() - y_mesh_density - Y_PROBE_OFFSET_FROM_EXTRUDER : -INFINITY;