diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ea3ac85..f00c574e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,8 @@ will consitute of a breaking change warranting a new major release:
 ## Fixed
 
 - Important bugfixes for PTME. See `q7s-package` CHANGELOG.
+- TCS fixes: Set temperature values to invalid value for MAX31865 RTD handler, SUS handler
+  and STR handler. Also set dataset to invakid for RTD handler.
 - Fixed H parameter in SUS converter from 1 mm to 2.5 mm.
 
 ## Changed
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/acs/str/StarTrackerHandler.cpp b/mission/acs/str/StarTrackerHandler.cpp
index 1ba73181..cc5b19b7 100644
--- a/mission/acs/str/StarTrackerHandler.cpp
+++ b/mission/acs/str/StarTrackerHandler.cpp
@@ -18,6 +18,7 @@ extern "C" {
 
 #include "OBSWConfig.h"
 #include "eive/definitions.h"
+#include "fsfw/thermal/tcsDefinitions.h"
 
 std::atomic_bool JCFG_DONE(false);
 
@@ -111,6 +112,9 @@ void StarTrackerHandler::doShutDown() {
   }
   {
     PoolReadGuard pg(&temperatureSet);
+    temperatureSet.fpgaTemperature = thermal::INVALID_TEMPERATURE;
+    temperatureSet.cmosTemperature = thermal::INVALID_TEMPERATURE;
+    temperatureSet.mcuTemperature = thermal::INVALID_TEMPERATURE;
     temperatureSet.setValidity(false, true);
   }
   reinitNextSetParam = 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);
   }