diff --git a/Destination.cpp b/Destination.cpp
index d48bee92..56681884 100644
--- a/Destination.cpp
+++ b/Destination.cpp
@@ -812,10 +812,10 @@ namespace client
 		return dest;
 	}	
 		
-  std::shared_ptr<i2p::datagram::DatagramDestination> ClientDestination::CreateDatagramDestination ()
+  i2p::datagram::DatagramDestination * ClientDestination::CreateDatagramDestination ()
 	{
 		if (m_DatagramDestination == nullptr)
-			m_DatagramDestination = std::make_shared<i2p::datagram::DatagramDestination> (GetSharedFromThis ());
+			m_DatagramDestination = new i2p::datagram::DatagramDestination (GetSharedFromThis ());
 		return m_DatagramDestination;	
 	}
 
diff --git a/Destination.h b/Destination.h
index 6cd4c19c..3faab9cc 100644
--- a/Destination.h
+++ b/Destination.h
@@ -164,8 +164,8 @@ namespace client
 			bool IsAcceptingStreams () const;
 
 			// datagram
-      std::shared_ptr<i2p::datagram::DatagramDestination> GetDatagramDestination () const { return m_DatagramDestination; };
-      std::shared_ptr<i2p::datagram::DatagramDestination> CreateDatagramDestination ();
+      i2p::datagram::DatagramDestination * GetDatagramDestination () const { return m_DatagramDestination; };
+      i2p::datagram::DatagramDestination * CreateDatagramDestination ();
 			
 			// implements LocalDestination		
 			const uint8_t * GetEncryptionPrivateKey () const { return m_EncryptionPrivateKey; };
@@ -190,7 +190,7 @@ namespace client
 
 			std::shared_ptr<i2p::stream::StreamingDestination> m_StreamingDestination; // default
 			std::map<uint16_t, std::shared_ptr<i2p::stream::StreamingDestination> > m_StreamingDestinationsByPorts;
-      std::shared_ptr<i2p::datagram::DatagramDestination> m_DatagramDestination;
+      i2p::datagram::DatagramDestination * m_DatagramDestination;
 
 		public: