diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2d3d82a..ff044f52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,9 @@ will consitute of a breaking change warranting a new major release:
 ## Fixed
 
 - PUS 15 was not scheduled
+- Transmitter timeout set to 2 minutes instead of 15 minutes. This will prevent to discharge the battery
+  in case the syrlinks starts transmitting due to detection of unintentional bitlock. This happened e.g. on ground
+  when the uplink to the flying latop was established.
 
 # [v1.35.1] 2023-03-04
 
diff --git a/mission/system/tree/comModeTree.h b/mission/system/tree/comModeTree.h
index 9260e3ea..0ac7f9b3 100644
--- a/mission/system/tree/comModeTree.h
+++ b/mission/system/tree/comModeTree.h
@@ -11,8 +11,9 @@ extern ComSubsystem SUBSYSTEM;
 
 // The syrlinks must not transmitting longer then 15 minutes otherwise the
 // transceiver might be damaged due to overheating
-// 15 minutes in milliseconds
-static const uint32_t TRANSMITTER_TIMEOUT = 900000;
+// This is the initial timeout of 2 minutes. The timeout needs to be incremented
+// before each overpass
+static const uint32_t TRANSMITTER_TIMEOUT = 120000;
 
 Subsystem& init();
 }  // namespace com