diff --git a/AddressBook.cpp b/AddressBook.cpp
index 78e9731f..9f1af809 100644
--- a/AddressBook.cpp
+++ b/AddressBook.cpp
@@ -547,8 +547,7 @@ namespace client
 			auto datagram = dest->GetDatagramDestination ();
       if(datagram == nullptr) datagram = dest->CreateDatagramDestination();
 			datagram->SetReceiver (std::bind (&AddressBook::HandleLookupResponse, this, 
-				std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5), 
-				ADDRESS_RESPONSE_DATAGRAM_PORT);
+				std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5));
 		}	
 	}
 	
@@ -559,7 +558,7 @@ namespace client
 		{
 			auto datagram = dest->GetDatagramDestination ();
 			if (datagram)
-			    datagram->ResetReceiver (ADDRESS_RESPONSE_DATAGRAM_PORT);
+        datagram->ResetReceiver ();
 		}	
 	}
 
diff --git a/I2PTunnel.cpp b/I2PTunnel.cpp
index 69360c2c..4c106d4d 100644
--- a/I2PTunnel.cpp
+++ b/I2PTunnel.cpp
@@ -590,14 +590,14 @@ namespace client
     m_LocalDest = localDestination;
     m_LocalDest->Start();
     auto dgram = m_LocalDest->CreateDatagramDestination();
-    dgram->SetReceiver(std::bind(&I2PUDPServerTunnel::HandleRecvFromI2P, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5), 0);
+    dgram->SetReceiver(std::bind(&I2PUDPServerTunnel::HandleRecvFromI2P, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5));
   }
 
   I2PUDPServerTunnel::~I2PUDPServerTunnel()
   {
     auto dgram = m_LocalDest->GetDatagramDestination();
     if (dgram) {
-      dgram->ResetReceiver(0);
+      dgram->ResetReceiver();
     }
     LogPrint(eLogInfo, "UDPServer: done");
   }
@@ -671,7 +671,7 @@ namespace client
   I2PUDPClientTunnel::~I2PUDPClientTunnel() {
     auto dgram = m_LocalDest->GetDatagramDestination();
     if (dgram) {
-      dgram->ResetReceiver(LocalPort);
+      dgram->ResetReceiver();
     }
     if (m_Session) delete m_Session;
     m_cancel_resolve = true;