diff --git a/mission/acs/SusHandler.cpp b/mission/acs/SusHandler.cpp
index c347020f..6fa4d231 100644
--- a/mission/acs/SusHandler.cpp
+++ b/mission/acs/SusHandler.cpp
@@ -30,6 +30,7 @@ void SusHandler::doStartUp() {
 void SusHandler::doShutDown() {
   if (internalState != InternalState::SHUTDOWN) {
     PoolReadGuard pg(&dataset);
+    dataset.tempC = thermal::INVALID_TEMPERATURE;
     dataset.setValidity(false, true);
     internalState = InternalState::SHUTDOWN;
     commandExecuted = false;
diff --git a/mission/tcs/Max31865EiveHandler.cpp b/mission/tcs/Max31865EiveHandler.cpp
index 599071ef..a3c1dce1 100644
--- a/mission/tcs/Max31865EiveHandler.cpp
+++ b/mission/tcs/Max31865EiveHandler.cpp
@@ -37,6 +37,8 @@ void Max31865EiveHandler::doShutDown() {
     transitionOk = false;
   }
   if (state == InternalState::INACTIVE and transitionOk) {
+    sensorDataset.temperatureCelcius = thermal::INVALID_TEMPERATURE;
+    sensorDataset.setValidity(false, true);
     updatePeriodicReply(false, EiveMax31855::RtdCommands::EXCHANGE_SET_ID);
     setMode(MODE_OFF);
   }