diff --git a/osal/linux/TcUnixUdpPollingTask.cpp b/osal/linux/TcUnixUdpPollingTask.cpp
index 670ba804..7df56a95 100644
--- a/osal/linux/TcUnixUdpPollingTask.cpp
+++ b/osal/linux/TcUnixUdpPollingTask.cpp
@@ -33,7 +33,7 @@ ReturnValue_t TcUnixUdpPollingTask::performOperation(uint8_t opCode) {
 	while(1) {
 		//! Sender Address is cached here.
 		struct sockaddr_in senderAddress;
-		socklen_t senderSockLen = 0;
+		socklen_t senderSockLen = sizeof(senderAddress);
 		ssize_t bytesReceived = recvfrom(serverUdpSocket,
 				receptionBuffer.data(), frameSize, receptionFlags,
 				reinterpret_cast<sockaddr*>(&senderAddress), &senderSockLen);
@@ -45,8 +45,8 @@ ReturnValue_t TcUnixUdpPollingTask::performOperation(uint8_t opCode) {
 
 			continue;
 		}
-//		sif::debug << "TcSocketPollingTask::performOperation: " << bytesReceived
-//				<< " bytes received" << std::endl;
+		sif::debug << "TcSocketPollingTask::performOperation: " << bytesReceived
+				<< " bytes received" << std::endl;
 
 		ReturnValue_t result = handleSuccessfullTcRead(bytesReceived);
 		if(result != HasReturnvaluesIF::RETURN_FAILED) {
diff --git a/osal/linux/TmTcUnixUdpBridge.cpp b/osal/linux/TmTcUnixUdpBridge.cpp
index b55291b3..71a39384 100644
--- a/osal/linux/TmTcUnixUdpBridge.cpp
+++ b/osal/linux/TmTcUnixUdpBridge.cpp
@@ -65,13 +65,17 @@ TmTcUnixUdpBridge::~TmTcUnixUdpBridge() {
 ReturnValue_t TmTcUnixUdpBridge::sendTm(const uint8_t *data, size_t dataLen) {
 	int flags = 0;
 
-	clientAddress.sin_addr.s_addr = htons(INADDR_ANY);
-	//clientAddress.sin_addr.s_addr = inet_addr("127.73.73.1");
-	clientAddressLen = sizeof(serverAddress);
+	MutexHelper lock(mutex, MutexIF::TimeoutType::WAITING, 10);
 
-//	char ipAddress [15];
-//	sif::debug << "IP Address Sender: "<< inet_ntop(AF_INET,
-//					&clientAddress.sin_addr.s_addr, ipAddress, 15) << std::endl;
+	if(ipAddrAnySet){
+		clientAddress.sin_addr.s_addr = htons(INADDR_ANY);
+		//clientAddress.sin_addr.s_addr = inet_addr("127.73.73.1");
+		clientAddressLen = sizeof(serverAddress);
+	}
+
+	char ipAddress [15];
+	sif::debug << "IP Address Sender: "<< inet_ntop(AF_INET,
+					&clientAddress.sin_addr.s_addr, ipAddress, 15) << std::endl;
 
 	ssize_t bytesSent = sendto(serverSocket, data, dataLen, flags,
 			reinterpret_cast<sockaddr*>(&clientAddress), clientAddressLen);
@@ -85,7 +89,7 @@ ReturnValue_t TmTcUnixUdpBridge::sendTm(const uint8_t *data, size_t dataLen) {
 	return HasReturnvaluesIF::RETURN_OK;
 }
 
-void TmTcUnixUdpBridge::checkAndSetClientAddress(sockaddr_in newAddress) {
+void TmTcUnixUdpBridge::checkAndSetClientAddress(sockaddr_in& newAddress) {
 	MutexHelper lock(mutex, MutexIF::TimeoutType::WAITING, 10);
 
 //	char ipAddress [15];
@@ -168,3 +172,7 @@ void TmTcUnixUdpBridge::handleSendError() {
 	}
 }
 
+void TmTcUnixUdpBridge::setClientAddressToAny(bool ipAddrAnySet){
+	this->ipAddrAnySet = ipAddrAnySet;
+}
+
diff --git a/osal/linux/TmTcUnixUdpBridge.h b/osal/linux/TmTcUnixUdpBridge.h
index 5245c44c..ae6f6adc 100644
--- a/osal/linux/TmTcUnixUdpBridge.h
+++ b/osal/linux/TmTcUnixUdpBridge.h
@@ -20,8 +20,9 @@ public:
 			uint16_t serverPort = 0xFFFF,uint16_t clientPort = 0xFFFF);
 	virtual~ TmTcUnixUdpBridge();
 
-	void checkAndSetClientAddress(sockaddr_in clientAddress);
+	void checkAndSetClientAddress(sockaddr_in& clientAddress);
 
+	void setClientAddressToAny(bool ipAddrAnySet);
 protected:
 	virtual ReturnValue_t sendTm(const uint8_t * data, size_t dataLen) override;
 
@@ -36,6 +37,8 @@ private:
 	struct sockaddr_in serverAddress;
 	socklen_t serverAddressLen = 0;
 
+	bool ipAddrAnySet = false;
+
 	//! Access to the client address is mutex protected as it is set
 	//! by another task.
 	MutexIF* mutex;