diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd1adb9a..4ba6a2a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,15 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+## Changed
+
+- STR missed reply handling is now moved to DHB rather than the COM interface. The COM IF will
+  still trigger an event if a reply is taking too long.
+- The FM and EM STR FDIR now have different maximum reply tresholds. This is because the
+  EM STR behaved odd and sometimes takes 3-4 seconds to respond to a reply, which must be
+  investigated further.
+
+
 # [v6.1.0] 2023-07-13
 
 - `eive-tmtc`: v5.2.0
diff --git a/mission/acs/str/StarTrackerHandler.cpp b/mission/acs/str/StarTrackerHandler.cpp
index a6e601a7..29fccf53 100644
--- a/mission/acs/str/StarTrackerHandler.cpp
+++ b/mission/acs/str/StarTrackerHandler.cpp
@@ -794,13 +794,11 @@ void StarTrackerHandler::doOnTransition(Submode_t subModeFrom) {
 void StarTrackerHandler::doNormalTransition(Mode_t modeFrom, Submode_t subModeFrom) {
   using namespace startracker;
   if (subModeFrom == SUBMODE_FIRMWARE) {
-    solutionSet.setReportingEnabled(true);
     setMode(MODE_NORMAL);
   } else if (subModeFrom == SUBMODE_BOOTLOADER) {
     bootFirmware(MODE_NORMAL);
   } else if (modeFrom == MODE_NORMAL && subModeFrom == SUBMODE_NONE) {
     // Device handler already in mode normal
-    solutionSet.setReportingEnabled(true);
     setMode(MODE_NORMAL);
   }
 }
@@ -823,6 +821,7 @@ void StarTrackerHandler::bootFirmware(Mode_t toMode) {
         setMode(toMode, startracker::SUBMODE_FIRMWARE);
       }
       sif::info << "STR: Firmware boot success" << std::endl;
+      solutionSet.setReportingEnabled(true);
       internalState = InternalState::IDLE;
       startupState = StartupState::IDLE;
       break;