diff --git a/source/Core/Drivers/TipThermoModel.cpp b/source/Core/Drivers/TipThermoModel.cpp
index cd4076d4..4e708d54 100644
--- a/source/Core/Drivers/TipThermoModel.cpp
+++ b/source/Core/Drivers/TipThermoModel.cpp
@@ -76,11 +76,7 @@ uint32_t TipThermoModel::getTipInC(bool sampleNow) {
   // Power usage indicates that our tip temp is lower than our thermocouple temp.
   // I found a number that doesn't unbalance the existing PID, causing overshoot.
   // This could be tuned in concert with PID parameters...
-#ifdef THERMAL_MASS_OVERSHOOTS
-  currentTipTempInC += x10WattHistory.average() / 25;
-#else
-  currentTipTempInC -= x10WattHistory.average() / 25;
-#endif
+
   if (currentTipTempInC < 0)
     return 0;
   return currentTipTempInC;
@@ -93,7 +89,7 @@ uint32_t TipThermoModel::getTipInF(bool sampleNow) {
 }
 
 uint32_t TipThermoModel::getTipMaxInC() {
-  uint32_t maximumTipTemp = TipThermoModel::convertTipRawADCToDegC(0x7FFF - (21 * 5)); // back off approx 5 deg c from ADC max
+  uint32_t maximumTipTemp = TipThermoModel::convertTipRawADCToDegC(0x7FFF - (21 * 3)); // back off approx 5 deg c from ADC max
   maximumTipTemp += getHandleTemperature(0) / 10;                                      // Add handle offset
   return maximumTipTemp - 1;
 }