diff --git a/mission/acs/str/StarTrackerHandler.cpp b/mission/acs/str/StarTrackerHandler.cpp
index cc5b19b7..d0d29345 100644
--- a/mission/acs/str/StarTrackerHandler.cpp
+++ b/mission/acs/str/StarTrackerHandler.cpp
@@ -88,7 +88,6 @@ void StarTrackerHandler::doStartUp() {
     default:
       return;
   }
-  solutionSet.setReportingEnabled(true);
   startupState = StartupState::DONE;
   internalState = InternalState::IDLE;
   setMode(_MODE_TO_ON);
@@ -787,11 +786,13 @@ 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);
   }
 }
diff --git a/tmtc b/tmtc
index eea76835..62bd5356 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit eea768358101a16912c0c49ad5e66a8c90826121
+Subproject commit 62bd5356220bab1ce9f3ddaa7aaf75963b8bd596