diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp
index 1061e7e..bfede16 100644
--- a/MMDVMHost.cpp
+++ b/MMDVMHost.cpp
@@ -164,10 +164,12 @@ m_lockFileName(),
 m_remoteControl(NULL),
 m_fixedMode(false)
 {
+	CUDPSocket::startup();
 }
 
 CMMDVMHost::~CMMDVMHost()
 {
+	CUDPSocket::shutdown();
 }
 
 int CMMDVMHost::run()
diff --git a/RemoteCommand.cpp b/RemoteCommand.cpp
index addc0c6..04322ae 100644
--- a/RemoteCommand.cpp
+++ b/RemoteCommand.cpp
@@ -51,12 +51,16 @@ int main(int argc, char** argv)
 CRemoteCommand::CRemoteCommand(unsigned int port) :
 m_port(port)
 {
+	CUDPSocket::startup();
+
 	::LogInitialise(false, ".", "RemoteCommand", 2U, 2U);
 }
 
 CRemoteCommand::~CRemoteCommand()
 {
 	::LogFinalise();
+
+	CUDPSocket::shutdown();
 }
 
 int CRemoteCommand::send(const std::string& command)
diff --git a/UDPSocket.cpp b/UDPSocket.cpp
index 382925f..3f6192a 100644
--- a/UDPSocket.cpp
+++ b/UDPSocket.cpp
@@ -37,12 +37,6 @@ m_address_save(address),
 m_port_save(port),
 m_counter(0U)
 {
-#if defined(_WIN32) || defined(_WIN64)
-	WSAData data;
-	int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);
-	if (wsaRet != 0)
-		LogError("Error from WSAStartup");
-#endif
 	for (int i = 0; i < UDP_SOCKET_MAX; i++) {
 		m_address[i] = "";
 		m_port[i] = 0U;
@@ -56,12 +50,6 @@ m_address_save(),
 m_port_save(port),
 m_counter(0U)
 {
-#if defined(_WIN32) || defined(_WIN64)
-	WSAData data;
-	int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);
-	if (wsaRet != 0)
-		LogError("Error from WSAStartup");
-#endif
 	for (int i = 0; i < UDP_SOCKET_MAX; i++) {
 		m_address[i] = "";
 		m_port[i] = 0U;
@@ -72,6 +60,20 @@ m_counter(0U)
 
 CUDPSocket::~CUDPSocket()
 {
+}
+
+void CUDPSocket::startup()
+{
+#if defined(_WIN32) || defined(_WIN64)
+	WSAData data;
+	int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);
+	if (wsaRet != 0)
+		LogError("Error from WSAStartup");
+#endif
+}
+
+void CUDPSocket::shutdown()
+{
 #if defined(_WIN32) || defined(_WIN64)
 	::WSACleanup();
 #endif
diff --git a/UDPSocket.h b/UDPSocket.h
index 3f5585b..6e3846c 100644
--- a/UDPSocket.h
+++ b/UDPSocket.h
@@ -60,8 +60,12 @@ public:
 	void close();
 	void close(const unsigned int index);
 
+	static void startup();
+	static void shutdown();
+
 	static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length);
 	static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length, struct addrinfo& hints);
+
 	static bool match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type = IMT_ADDRESS_AND_PORT);
 
 	static bool isNone(const sockaddr_storage& addr);