diff --git a/CHANGELOG.md b/CHANGELOG.md
index 759046bd..d224e629 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
-# [v2.2.0] to be released
+# [v4.0.0] to be released
 
 # [v3.0.0] to be released
 
@@ -93,6 +93,7 @@ will consitute of a breaking change warranting a new major release:
 - Prevent spam of TCS controller heater unavailability event if all heaters are in external control.
 - TCS heater switch info set contained invalid values because of a faulty `memcpy` in the TCS
   controller. There is not crash risk but the heater states were invalid.
+- STR datasets were not set to invalid on shutdown.
 - Fixed usage of quaternion valid flag, which does not actually represent the validity of the
   quaternion.
 
diff --git a/mission/acs/str/StarTrackerHandler.cpp b/mission/acs/str/StarTrackerHandler.cpp
index 0942164a..cf2a5919 100644
--- a/mission/acs/str/StarTrackerHandler.cpp
+++ b/mission/acs/str/StarTrackerHandler.cpp
@@ -100,6 +100,19 @@ void StarTrackerHandler::doShutDown() {
   startupState = StartupState::IDLE;
   bootState = FwBootState::NONE;
   solutionSet.setReportingEnabled(false);
+  {
+    PoolReadGuard pg(&solutionSet);
+    solutionSet.caliQw.value = 0.0;
+    solutionSet.caliQx.value = 0.0;
+    solutionSet.caliQy.value = 0.0;
+    solutionSet.caliQz.value = 0.0;
+    solutionSet.isTrustWorthy = 0;
+    solutionSet.setValidity(false, true);
+  }
+  {
+    PoolReadGuard pg(&temperatureSet);
+    temperatureSet.setValidity(false, true);
+  }
   reinitNextSetParam = false;
   setMode(_MODE_POWER_DOWN);
 }