diff --git a/mission/acs/str/StarTrackerHandler.cpp b/mission/acs/str/StarTrackerHandler.cpp
index d0d29345..498b5b87 100644
--- a/mission/acs/str/StarTrackerHandler.cpp
+++ b/mission/acs/str/StarTrackerHandler.cpp
@@ -786,13 +786,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);
   }
 }
@@ -814,6 +812,7 @@ void StarTrackerHandler::bootFirmware(Mode_t toMode) {
       } else {
         setMode(toMode, startracker::SUBMODE_FIRMWARE);
       }
+      solutionSet.setReportingEnabled(true);
       sif::info << "STR: Firmware boot success" << std::endl;
       internalState = InternalState::IDLE;
       startupState = StartupState::IDLE;