diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp
index be88b760..aefce4ca 100644
--- a/mission/controller/ThermalController.cpp
+++ b/mission/controller/ThermalController.cpp
@@ -1759,8 +1759,8 @@ void ThermalController::heaterTransitionControl(const HeaterSwitchStates& curren
     if (heaterStates[i].switchTransition) {
       if (currentHeaterStates[i] == heaterStates[i].target) {
         // Required for max heater period control
-        if (currentHeaterStates[i] == HeaterHandler::SwitchState::ON) {
-          heaterStates[i].heaterOnPeriod.setTimeout(MAX_HEATER_ON_DURATIONS[i]);
+        if (currentHeaterStates[i] == heater::SwitchState::ON) {
+          heaterStates[i].heaterOnPeriod.setTimeout(MAX_HEATER_ON_DURATIONS_MS[i]);
           heaterStates[i].heaterOnPeriod.resetTimer();
         } else {
           // The heater might still be one for some thermal components, so cross-check
@@ -1786,7 +1786,9 @@ void ThermalController::heaterMaxDurationControl(const HeaterSwitchStates& curre
         heaterStates[i].heaterOnPeriod.hasTimedOut()) {
       heaterStates[i].switchTransition = false;
       heaterStates[i].heaterSwitchControlCycles = 0;
-      heaterHandler.switchHeater(static_cast<heater::Switch>(i), HeaterHandler::SwitchState::OFF);
+      heaterHandler.switchHeater(static_cast<heater::Switch>(i), heater::SwitchState::OFF);
+      triggerEvent(tcsCtrl::TCS_HEATER_MAX_BURN_TIME_REACHED, static_cast<uint32_t>(i),
+                   MAX_HEATER_ON_DURATIONS_MS[i]);
       // The heater might still be one for some thermal components, so cross-check
       // those components
       crossCheckHeaterStateOfComponentsWhenHeaterGoesOff(static_cast<heater::Switch>(i));
diff --git a/mission/controller/ThermalController.h b/mission/controller/ThermalController.h
index 82896116..6376f501 100644
--- a/mission/controller/ThermalController.h
+++ b/mission/controller/ThermalController.h
@@ -107,23 +107,23 @@ class ThermalController : public ExtendedControllerBase {
   static constexpr int16_t SANITY_LIMIT_UPPER_TEMP = 160;
 
   // 1 hour
-  static constexpr uint32_t MAX_HEATER_ON_DURATION_MS = 60 * 60 * 1000;
-  static constexpr uint32_t MAX_HEATER_ON_DURATIONS[8] = {// PLOC PROC board
-                                                          MAX_HEATER_ON_DURATION_MS,
-                                                          // PCDU PDU
-                                                          MAX_HEATER_ON_DURATION_MS,
-                                                          // ACS Board
-                                                          MAX_HEATER_ON_DURATION_MS,
-                                                          // OBC Board
-                                                          MAX_HEATER_ON_DURATION_MS,
-                                                          // Camera
-                                                          MAX_HEATER_ON_DURATION_MS,
-                                                          // STR
-                                                          MAX_HEATER_ON_DURATION_MS,
-                                                          // DRO
-                                                          MAX_HEATER_ON_DURATION_MS,
-                                                          // S-Band
-                                                          MAX_HEATER_ON_DURATION_MS};
+  static constexpr uint32_t DEFAULT_MAX_HEATER_ON_DURATION_MS = 60 * 60 * 1000;
+  static constexpr uint32_t MAX_HEATER_ON_DURATIONS_MS[8] = {// PLOC PROC board
+                                                             DEFAULT_MAX_HEATER_ON_DURATION_MS,
+                                                             // PCDU PDU
+                                                             DEFAULT_MAX_HEATER_ON_DURATION_MS,
+                                                             // ACS Board
+                                                             DEFAULT_MAX_HEATER_ON_DURATION_MS,
+                                                             // OBC Board
+                                                             DEFAULT_MAX_HEATER_ON_DURATION_MS,
+                                                             // Camera
+                                                             DEFAULT_MAX_HEATER_ON_DURATION_MS,
+                                                             // STR
+                                                             DEFAULT_MAX_HEATER_ON_DURATION_MS,
+                                                             // DRO
+                                                             DEFAULT_MAX_HEATER_ON_DURATION_MS,
+                                                             // S-Band
+                                                             DEFAULT_MAX_HEATER_ON_DURATION_MS};
 
   ThermalController(object_id_t objectId, HeaterHandler& heater,
                     const std::atomic_bool& tcsBoardShortUnavailable, bool pollPcdu1Tmp);
diff --git a/mission/controller/tcsDefs.h b/mission/controller/tcsDefs.h
index c77d9352..6442b51a 100644
--- a/mission/controller/tcsDefs.h
+++ b/mission/controller/tcsDefs.h
@@ -22,6 +22,8 @@ static constexpr Event MGT_OVERHEATING = MAKE_EVENT(8, severity::HIGH);
 static constexpr Event TCS_SWITCHING_HEATER_ON = MAKE_EVENT(9, severity::INFO);
 //! [EXPORT] : [COMMENT] P1: Module index. P2: Heater index
 static constexpr Event TCS_SWITCHING_HEATER_OFF = MAKE_EVENT(10, severity::INFO);
+//! [EXPORT] : [COMMENT] P1: Heater index. P2: Maximum burn time for heater.
+static constexpr Event TCS_HEATER_MAX_BURN_TIME_REACHED = MAKE_EVENT(11, severity::MEDIUM);
 
 enum SetId : uint32_t {
   SENSOR_TEMPERATURES = 0,