diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp
index cee55b6617..4b490e08db 100755
--- a/Firmware/temperature.cpp
+++ b/Firmware/temperature.cpp
@@ -387,9 +387,6 @@ void __attribute__((noinline)) PID_autotune(float temp, int extruder, int ncycle
         }
       }
     }
-    #ifndef MAX_OVERSHOOT_PID_AUTOTUNE
-      #define MAX_OVERSHOOT_PID_AUTOTUNE 20
-    #endif
     if(input > (temp + MAX_OVERSHOOT_PID_AUTOTUNE)) {
       SERIAL_PROTOCOLLNPGM("PID Autotune failed! Temperature too high");
 	  pid_tuning_finished = true;
diff --git a/Firmware/variants/MK25-RAMBo10a.h b/Firmware/variants/MK25-RAMBo10a.h
index 754e7af8a0..871fe27155 100644
--- a/Firmware/variants/MK25-RAMBo10a.h
+++ b/Firmware/variants/MK25-RAMBo10a.h
@@ -189,6 +189,7 @@
 #define DEFAULT_Kd 73.76
 #else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
 // Define PID constants for extruder
+#define MAX_OVERSHOOT_PID_AUTOTUNE 20
 #define DEFAULT_Kp 16.13
 #define DEFAULT_Ki 1.1625
 #define DEFAULT_Kd 56.23
diff --git a/Firmware/variants/MK25-RAMBo13a.h b/Firmware/variants/MK25-RAMBo13a.h
index bdd7fa98d4..43b4a500e7 100644
--- a/Firmware/variants/MK25-RAMBo13a.h
+++ b/Firmware/variants/MK25-RAMBo13a.h
@@ -189,6 +189,7 @@
 #define DEFAULT_Kd 73.76
 #else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
 // Define PID constants for extruder
+#define MAX_OVERSHOOT_PID_AUTOTUNE 20
 #define DEFAULT_Kp 16.13
 #define DEFAULT_Ki 1.1625
 #define DEFAULT_Kd 56.23
diff --git a/Firmware/variants/MK25S-RAMBo10a.h b/Firmware/variants/MK25S-RAMBo10a.h
index 0ced06515a..a7f21a09ec 100644
--- a/Firmware/variants/MK25S-RAMBo10a.h
+++ b/Firmware/variants/MK25S-RAMBo10a.h
@@ -189,6 +189,7 @@
 #define DEFAULT_Kd 73.76
 #else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
 // Define PID constants for extruder
+#define MAX_OVERSHOOT_PID_AUTOTUNE 20
 #define DEFAULT_Kp 16.13
 #define DEFAULT_Ki 1.1625
 #define DEFAULT_Kd 56.23
diff --git a/Firmware/variants/MK25S-RAMBo13a.h b/Firmware/variants/MK25S-RAMBo13a.h
index e73451bc8d..91654d3bd9 100644
--- a/Firmware/variants/MK25S-RAMBo13a.h
+++ b/Firmware/variants/MK25S-RAMBo13a.h
@@ -189,6 +189,7 @@
 #define DEFAULT_Kd 73.76
 #else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
 // Define PID constants for extruder
+#define MAX_OVERSHOOT_PID_AUTOTUNE 20
 #define DEFAULT_Kp 16.13
 #define DEFAULT_Ki 1.1625
 #define DEFAULT_Kd 56.23
diff --git a/Firmware/variants/MK3-E3DREVO.h b/Firmware/variants/MK3-E3DREVO.h
index 374a6aa75b..36eaf289e7 100644
--- a/Firmware/variants/MK3-E3DREVO.h
+++ b/Firmware/variants/MK3-E3DREVO.h
@@ -325,6 +325,7 @@
 #define DEFAULT_Kd 73.76
 #else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
 // Define PID constants for E3D REVO
+#define MAX_OVERSHOOT_PID_AUTOTUNE 20
 #define DEFAULT_Kp 25.00
 #define DEFAULT_Ki 4.8
 #define DEFAULT_Kd 32.6
diff --git a/Firmware/variants/MK3.h b/Firmware/variants/MK3.h
index 4a08aa588d..83b2821a93 100644
--- a/Firmware/variants/MK3.h
+++ b/Firmware/variants/MK3.h
@@ -325,6 +325,7 @@
 #define DEFAULT_Kd 73.76
 #else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
 // Define PID constants for extruder
+#define MAX_OVERSHOOT_PID_AUTOTUNE 20
 #define DEFAULT_Kp 16.13
 #define DEFAULT_Ki 1.1625
 #define DEFAULT_Kd 56.23
diff --git a/Firmware/variants/MK3S-E3DREVO.h b/Firmware/variants/MK3S-E3DREVO.h
index bc0c425786..023dd4b3dd 100644
--- a/Firmware/variants/MK3S-E3DREVO.h
+++ b/Firmware/variants/MK3S-E3DREVO.h
@@ -325,6 +325,7 @@
 #define DEFAULT_Kd 73.76
 #else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
 // Define PID constants for E3D REVO
+#define MAX_OVERSHOOT_PID_AUTOTUNE 20
 #define DEFAULT_Kp 25.00
 #define DEFAULT_Ki 4.8
 #define DEFAULT_Kd 32.6
diff --git a/Firmware/variants/MK3S.h b/Firmware/variants/MK3S.h
index b6b4b86b4c..7ed96e7f32 100644
--- a/Firmware/variants/MK3S.h
+++ b/Firmware/variants/MK3S.h
@@ -325,6 +325,7 @@
 #define DEFAULT_Kd 73.76
 #else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
 // Define PID constants for extruder
+#define MAX_OVERSHOOT_PID_AUTOTUNE 20
 #define DEFAULT_Kp 16.13
 #define DEFAULT_Ki 1.1625
 #define DEFAULT_Kd 56.23