diff --git a/bsp_q7s/fmObjectFactory.cpp b/bsp_q7s/fmObjectFactory.cpp
index d22cc1bc..c3e19c9b 100644
--- a/bsp_q7s/fmObjectFactory.cpp
+++ b/bsp_q7s/fmObjectFactory.cpp
@@ -126,7 +126,7 @@ void ObjectFactory::createCcsdsComponents(LinuxLibgpioIF* gpioComIF) {
   AxiPtmeConfig* axiPtmeConfig =
       new AxiPtmeConfig(objects::AXI_PTME_CONFIG, q7s::UIO_PTME, q7s::uiomapids::PTME_CONFIG);
   PtmeConfig* ptmeConfig = new PtmeConfig(objects::PTME_CONFIG, axiPtmeConfig);
-#if OBSW_ENABLE_SYRLINKS_TRANSMIT_TIMEOUT == 1
+#if OBSW_ENABLE_SYRLINKS_TRANSMIT_TIMEOUT == 0
   // Set to high value when not sending via syrlinks
   static const uint32_t TRANSMITTER_TIMEOUT = 86400000;  // 1 day
 #else
diff --git a/fsfw b/fsfw
index 36669fd4..cda81fc8 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 36669fd4d914a2397a0c64e3292dde7145b1f077
+Subproject commit cda81fc8415c3873c035aa7ebbfa3fe93d519f08
diff --git a/mission/tmtc/CCSDSHandler.cpp b/mission/tmtc/CCSDSHandler.cpp
index 65c8182c..771d7a17 100644
--- a/mission/tmtc/CCSDSHandler.cpp
+++ b/mission/tmtc/CCSDSHandler.cpp
@@ -132,6 +132,9 @@ ReturnValue_t CCSDSHandler::initialize() {
 #if OBSW_SYRLINKS_SIMULATED == 1
   // Update data on rising edge
   ptmeConfig->invertTxClock(false);
+  transmitterCountdown.setTimeout(transmitterTimeout);
+  linkState = UP;
+  forwardLinkstate();
 #endif /* OBSW_SYRLINKS_SIMULATED == 1*/
 
   return result;
@@ -390,7 +393,7 @@ void CCSDSHandler::enableTransmit() {
 #ifndef TE0720_1CFA
   gpioIF->pullHigh(enTxClock);
   gpioIF->pullHigh(enTxData);
-#endif /* BOARD_TE0720 == 0 */
+#endif
 }
 
 void CCSDSHandler::checkTxTimer() {
@@ -403,10 +406,10 @@ void CCSDSHandler::checkTxTimer() {
 }
 
 void CCSDSHandler::disableTransmit() {
-#ifdef TE0720_1CFA
+#ifndef TE0720_1CFA
   gpioIF->pullLow(enTxClock);
   gpioIF->pullLow(enTxData);
-#endif /* BOARD_TE0720 == 0 */
+#endif
   linkState = DOWN;
   forwardLinkstate();
   transmitterCountdown.setTimeout(0);
diff --git a/mission/tmtc/VirtualChannel.cpp b/mission/tmtc/VirtualChannel.cpp
index 9d413ca7..49e373d5 100644
--- a/mission/tmtc/VirtualChannel.cpp
+++ b/mission/tmtc/VirtualChannel.cpp
@@ -64,4 +64,6 @@ void VirtualChannel::setPtmeObject(PtmeIF* ptme_) {
   ptme = ptme_;
 }
 
-void VirtualChannel::setLinkState(bool linkIsUp_) { linkIsUp = linkIsUp_; }
+void VirtualChannel::setLinkState(bool linkIsUp_) {
+  linkIsUp = linkIsUp_;
+}