diff --git a/CHANGELOG.md b/CHANGELOG.md
index a12c68bb..990ed751 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -89,6 +89,8 @@ will consitute of a breaking change warranting a new major release:
 - TCS Heater Handler: Always trigger mode event if a heater goes `OFF` or `ON`. This event might
   soon replace the `HEATER_WENT_ON` and `HEATER_WENT_OFF` events.
 - 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.
 
 # [v2.0.5] 2023-05-11
 
diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp
index 4c475e35..6205ce44 100644
--- a/mission/controller/ThermalController.cpp
+++ b/mission/controller/ThermalController.cpp
@@ -175,7 +175,7 @@ void ThermalController::performControlOperation() {
   heaterHandler.getAllSwitchStates(heaterSwitchStateArray);
   {
     PoolReadGuard pg(&heaterInfo);
-    std::memcpy(heaterInfo.heaterSwitchState.value, heaterStates.data(), 8);
+    std::memcpy(heaterInfo.heaterSwitchState.value, heaterSwitchStateArray.data(), 8);
     {
       PoolReadGuard pg2(&currentVecPdu2);
       if (pg.getReadResult() == returnvalue::OK and pg2.getReadResult() == returnvalue::OK) {