diff --git a/osal/linux/TmTcUnixUdpBridge.cpp b/osal/linux/TmTcUnixUdpBridge.cpp
index c8dc612c..8de62cab 100644
--- a/osal/linux/TmTcUnixUdpBridge.cpp
+++ b/osal/linux/TmTcUnixUdpBridge.cpp
@@ -108,7 +108,8 @@ TmTcUnixUdpBridge::~TmTcUnixUdpBridge() {
 ReturnValue_t TmTcUnixUdpBridge::sendTm(const uint8_t *data, size_t dataLen) {
 	int flags = 0;
 
-	MutexGuard lock(mutex, MutexIF::TimeoutType::WAITING, 10);
+	/* The target address can be set by different threads so this lock ensures thread-safety */
+	MutexGuard lock(mutex, timeoutType, mutexTimeoutMs);
 
 	if(ipAddrAnySet){
 		clientAddress.sin_addr.s_addr = htons(INADDR_ANY);
@@ -145,7 +146,7 @@ ReturnValue_t TmTcUnixUdpBridge::sendTm(const uint8_t *data, size_t dataLen) {
 }
 
 void TmTcUnixUdpBridge::checkAndSetClientAddress(sockaddr_in& newAddress) {
-	MutexGuard lock(mutex, MutexIF::TimeoutType::WAITING, 10);
+	MutexGuard lock(mutex, timeoutType, mutexTimeoutMs);
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1 && FSFW_UDP_RCV_WIRETAPPING_ENABLED == 1
     char ipAddress [15];
@@ -163,6 +164,12 @@ void TmTcUnixUdpBridge::checkAndSetClientAddress(sockaddr_in& newAddress) {
 	}
 }
 
+void TmTcUnixUdpBridge::setMutexProperties(MutexIF::TimeoutType timeoutType,
+        dur_millis_t timeoutMs) {
+    this->timeoutType = timeoutType;
+    this->mutexTimeoutMs = timeoutMs;
+}
+
 void TmTcUnixUdpBridge::setClientAddressToAny(bool ipAddrAnySet){
 	this->ipAddrAnySet = ipAddrAnySet;
 }
diff --git a/osal/linux/TmTcUnixUdpBridge.h b/osal/linux/TmTcUnixUdpBridge.h
index f5e67138..26b6f0f7 100644
--- a/osal/linux/TmTcUnixUdpBridge.h
+++ b/osal/linux/TmTcUnixUdpBridge.h
@@ -20,6 +20,11 @@ public:
 			std::string serverPort = "", std::string clientPort = "");
 	virtual~ TmTcUnixUdpBridge();
 
+	/**
+	 * Set properties of internal mutex.
+	 */
+	void setMutexProperties(MutexIF::TimeoutType timeoutType, dur_millis_t timeoutMs);
+
 	ReturnValue_t initialize() override;
 
 	void checkAndSetClientAddress(sockaddr_in& clientAddress);
@@ -43,8 +48,9 @@ private:
 
 	bool ipAddrAnySet = false;
 
-	//! Access to the client address is mutex protected as it is set
-	//! by another task.
+	//! Access to the client address is mutex protected as it is set by another task.
+	MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING;
+	dur_millis_t mutexTimeoutMs = 20;
 	MutexIF* mutex;
 };
 
diff --git a/osal/windows/TmTcWinUdpBridge.cpp b/osal/windows/TmTcWinUdpBridge.cpp
index 113c98fb..d2b2b2ec 100644
--- a/osal/windows/TmTcWinUdpBridge.cpp
+++ b/osal/windows/TmTcWinUdpBridge.cpp
@@ -114,9 +114,11 @@ TmTcWinUdpBridge::~TmTcWinUdpBridge() {
 }
 
 ReturnValue_t TmTcWinUdpBridge::sendTm(const uint8_t *data, size_t dataLen) {
-    MutexGuard lock(mutex, MutexIF::TimeoutType::WAITING, 10);
     int flags = 0;
 
+    /* The target address can be set by different threads so this lock ensures thread-safety */
+    MutexGuard lock(mutex, timeoutType, mutexTimeoutMs);
+
 #if FSFW_CPP_OSTREAM_ENABLED == 1 && FSFW_UDP_SEND_WIRETAPPING_ENABLED == 1
     clientAddress.sin_addr.s_addr = htons(INADDR_ANY);
     clientAddressLen = sizeof(serverAddress);
@@ -147,7 +149,8 @@ ReturnValue_t TmTcWinUdpBridge::sendTm(const uint8_t *data, size_t dataLen) {
 }
 
 void TmTcWinUdpBridge::checkAndSetClientAddress(sockaddr_in& newAddress) {
-    MutexGuard lock(mutex, MutexIF::TimeoutType::WAITING, 10);
+    /* The target address can be set by different threads so this lock ensures thread-safety */
+    MutexGuard lock(mutex, timeoutType, mutexTimeoutMs);
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1 && FSFW_UDP_SEND_WIRETAPPING_ENABLED == 1
     char ipAddress [15];
@@ -165,3 +168,8 @@ void TmTcWinUdpBridge::checkAndSetClientAddress(sockaddr_in& newAddress) {
     }
 }
 
+void TmTcWinUdpBridge::setMutexProperties(MutexIF::TimeoutType timeoutType,
+        dur_millis_t timeoutMs) {
+    this->timeoutType = timeoutType;
+    this->mutexTimeoutMs = timeoutMs;
+}
diff --git a/osal/windows/TmTcWinUdpBridge.h b/osal/windows/TmTcWinUdpBridge.h
index 762849f8..5cae308d 100644
--- a/osal/windows/TmTcWinUdpBridge.h
+++ b/osal/windows/TmTcWinUdpBridge.h
@@ -17,6 +17,11 @@ public:
             std::string udpServerPort = "", std::string udpClientPort = "");
     virtual~ TmTcWinUdpBridge();
 
+    /**
+     * Set properties of internal mutex.
+     */
+    void setMutexProperties(MutexIF::TimeoutType timeoutType, dur_millis_t timeoutMs);
+
     ReturnValue_t initialize() override;
 
     void checkAndSetClientAddress(sockaddr_in& clientAddress);
@@ -38,6 +43,8 @@ private:
     int serverAddressLen = 0;
 
     //! Access to the client address is mutex protected as it is set by another task.
+    MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING;
+    dur_millis_t mutexTimeoutMs = 20;
     MutexIF* mutex;
 };